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
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.
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.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot