How to configure Beyond Compare 3 for Eclipse conflict resolution?

eclipse svn diff conflict beyondcompare
Peter Boughton picture Peter Boughton · Jun 9, 2010 · Viewed 9.4k times · Source

What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution?

In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts.

The default parameters are:

"${yours}" "${theirs}" "${base}" "${merged}"

And it suggests TortoiseMerge settings of this:

/theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"

But what is the appropriate config for Beyond Compare?

Answer

Peter Boughton picture Peter Boughton · Jun 9, 2010

Looks like this is correct:

"${theirs}" "${yours}" "${base}" "${merged}"

Based on this forum post: http://www.scootersoftware.com/vbulletin/showthread.php?t=368#4

To label the sections appropriately, and run BC in a separate (solo) instance, it's this:

"${theirs}" "${yours}" "${base}" "${merged}"
/lefttitle="Incoming (${theirs})"
/centertitle="Base (${base})"
/righttitle="Local (${yours})"
/outputtitle="Merged (${merged})"
/solo

Multiple lines used above for readability, replace linebreaks with spaces for use, i.e.

 "${theirs}" "${yours}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${yours})" /outputtitle="Merged (${merged})" /solo

Related questions

What are the pros and cons of the SVN plugins for Eclipse, Subclipse and Subversive?

SVN in Eclipse is spread into two camps. The SVN people have developed a plugin called Subclipse. The Eclipse people have a plugin called Subversive. Broadly speaking they both do the same things. What are the advantages and disadvantages of …

Read More
How to change credentials for SVN repository in Eclipse?

I have Eclipse 3.4.2 installed on Windows with subclipse. Another developer added an SVN repository with his credentials and selected 'Save password'. Now every time I do anything with SVN his cached credentials are used. How can I change them to …

Read More
How do I check out an SVN project into Eclipse as a Java project?

I was trying to check out a project from SVN using Eclipse. I tried using "Checkout As" to make it into a "Java project from existing Ant script", but the project wizard requires the file to have already been downloaded. …

Read More