[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-12 23:25:15 CET

Do all of these software utilities (the ones below) automatically read and
manage the svn-conflict-generating files (eg, .mine, .rXX, etc)?

-Matt

At 2/12/2006 01:11 PM, Rory Clark wrote:
>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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Feb 12 23:27:14 2006

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