[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: Hobson, Neville <neville_hobson_at_mentor.com>
Date: 2006-02-10 10:01:03 CET

On PC, the TortoiseSVN client has an excellent iteractive diff and merge
tool.
 http://tortoisesvn.tigris.org/

Neville Hobson
Senior Consultant
Mentor Graphics UK Ltd,
Rivergate, London Road,
Newbury,
Berks, RG 14 2QB Tel.: - direct: +44 1635 811473
         - main: +44 1635 811411
         - fax : +44 1635 810110

Web - http://www.mentor.com
"Create Customer Competitive Advantage Through Passionate Teamwork"

 

-----Original Message-----
From: Matt England [mailto:mengland@mengland.net]
Sent: 10 February 2006 02:36
To: SVN Users email list
Cc: mengland@mengland.net
Subject: 3rd-party merging tools? Recommendations?

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

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

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