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

Re: 3rd-party merging tools? Recommendations?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 04:10:54 CET

At 2/9/2006 08:35 PM, Matt England wrote:
>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?

These 3 stand out after some web searching:

http://www.araxis.com/merge/
http://www.guiffy.com/GuiffyHelp/CVS.html
http://www.perforce.com/perforce/products/merge.html

...in part gathered from:

http://svn.haxx.se/tsvn/archive-2004-07/0180.shtml

Any further recommendations?

-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 04:13:24 2006

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