Matt,
We use KDiff3 for viewing diffs and merging files. KDiff3 is a three-way
merge tool for Linux, Windows & Mac and is free+open source:
http://kdiff3.sourceforge.net/
If you're developing in Java, the Eclipse IDE also has a two-way merge
feature.
Lieven.
> -----Original Message-----
> From: Matt England [mailto:mengland@mengland.net]
> Sent: vrijdag 10 februari 2006 3: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 08:43:10 2006