I use BeyondCompare 2 (http://www.scootersoftware.com/) for both diff'ing
and merging, especially since you see the two files side by side and then
have ability to manually align (in the case code blocks that have moved
around), copying lines from one side to the other, manually editing lines,
and, of course, saving those changes back to disk.
I like it a lot and strongly recommend it.
Rory
-----Original Message-----
From: Bart Robinson [mailto:lomew@pobox.com]
Sent: Sunday, February 12, 2006 10:34 AM
To: Matthew England
Cc: SVN Users email list
Subject: Re: 3rd-party merging tools? Recommendations?
You can try xxdiff, kompare, p4 merge, winmerge.
-- bart
On 2006-2-9 Matt England <mengland@mengland.net> 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? >
> 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 Sun Feb 12 20:13:21 2006