Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Groups
Explore all groups
Community resources

how pull request with conflicts

Jayan Anuranga
Jayan Anuranga Sep 22, 2017

How view conflicts in source tree

Answer
Watch
Like Be the first to like this

1 answer

0 votes
Mikael Sandberg
Mikael Sandberg Community Champion Sep 22, 2017 • edited

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.

Reply

Suggest an answer

Log in or Sign up to answer
Community showcase
Brian Ganninger
Brian Ganninger
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

841 views 3 2
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you