It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

how pull request with conflicts

How view conflicts in source tree

1 answer

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.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,910 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you