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.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot