[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

3rd-party merging tools? Recommendations?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 03:35:53 CET

The end of the "Merging Conflicts by Hand" section (found at
<http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4.1>) reads:

     "You can even use a third-party interactive merging tool to examine
those three files."

Where can I find such tools?

Can anyone recommend some tools more then others?

Is there a general consensus on the general usefulness of such tools?

My project is about to merge a branch to a trunk, and we expect there will
be numerous merge conflicts. I'm trying to see how much help we can get
from automation during this process.

-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 03:37:46 2006

This is an archived mail posted to the Subversion Users mailing list.