The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

how pull request with conflicts

Jayan Anuranga
September 22, 2017

How view conflicts in source tree

1 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
Mikael Sandberg
Community Champion
September 22, 2017

Make sure your source branch of the pull request is selected in SourceTree, then locate the target branch you are merging too in your pull request under Remote,right-click on it and select Diff Against Current. Then you can use an external diff tool, like P4Merge, to compare the files that Bitbucket are reporting as having a conflict.

You could also do a merge from the remote target branch into your local source branch but doing a Pull from the target branch, that will show you the conflicts as well.

TAGS
AUG Leaders

Atlassian Community Events