How view conflicts in source tree
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.