How do I use Beyond Compare 3 as external diff tool for SourceTree?

Hi,

I know this question has been asked elsewhere, but I have tried all of those suggestions and they either don't apply to my version of Beyond Compare or - for some reason - just don't work for me.

I am using Beyond Compare 3.  If I select it as an option in the Tools | Options then it opens as expected as an external diff tool.  The problem is that any conflict-resolutions I make in Beyond Compare seem to be lost when I close it.

Can anyone offer any help on how to get this working?

 

Kind wishes ~ Patrick

 

4 answers

You might try modifying config files directly instead of using sourcetree's options dialogs.

http://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows

Thanks for the answer.

I'll give that a try, but the lines that need to be entered into the config file look suspiciously (almost) identical to some instructions I followed for setting up Beyond Compare using the Custom option - i.e. setting the path to the program and then using the supported $ arguments.  Unfortunately, this didn't work either, so I don't hold out a lot of hope for the edits to the config file.  But I'll give it a try.

NB: Update to my question: I have now upgraded to Beyond Compare 4.  Foolishly, I thought throwing a few quid at the problem might fix it.  It didn't. sad

I wonder if the problem is that I don't have the Pro version of Beyond Compare and so cannot do a 3-way merge.  Is this what SourceTree attempts to do?

Looks like yes. Or, to be more accurate, it looks like the free version of Beyond Compare does not provide a 2-way merge option anymore (the instructions for Linux imply that featre was available in the free 1.7 version).

Seems the answer to the above thread is indeed to get the Pro version of Beyond Compare.  SourceTree does indeed need the 3-way merge.  I upgraded and SourceTree works just fine with Beyond Compare 4 by simply selecting is as the diff and merge tool in the options.  Brilliant!

Thank you for the help.

Thanks for this tip. I was about to buy 6 licenses of the standard edition for my team, and now I'll be sure to buy the Pro edition.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
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...

570 views 1 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