Recommendations for fixing conflicts in SourceTree

I'm a big of SourceTree and use it all the time.  One sticking point for me is that when I merge or rebase and encounter conflicts, I wind up opening the files in a text editor and manually editing them, looking for the <<<<< and >>>>> bits and hoping I got everything.


Is it possible in SourceTree to right-click a conflicted file and open a merge tool, or take an equivalent step?  And can I set my choice of merge tool in the SourceTree interface in some way?

1 answer

1 accepted

This widget could not be displayed.

Yes and yes.

If you right-click a conflicted file, there is a "Resolve Conflicts" pop-out menu, and one of the options is "Launch External Merge Tool" - almost exactly what you asked.

To choose a merge tool, go to Options > Diff. There are some pre-configured options (you have to install the referenced programs), or you can manually enter the command for some other diff/merge tool that you prefer.

Beautiful, thanks Seth.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

862 views 2 3
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