RE: Re: Merge problem SVN 1,8

As Stefan said, WinMerge is a "two-way diff" tool. It takes two input files and shows you the difference between them as its output.

Merging, however, requires a "three-way diff" tool, that can show you *the common base version* in addition to both their version and your version, and then generate output accordingly.

You could pass some subset of the three input files to WinMerge if you wanted, and do the merge resolution that way. But it's not a good idea. Often you really do need to compare both edited versions against the common base in order to understand what the change actually was (and this is critical if you want it to try to automatically resolve conflicts).

If you don't want to use TortoiseMerge for this, then I recommend using kdiff3. This is actually a three-way-merge tool, and will work properly.

(Incidentally, your .c file is not being "rolled back"; it gets updated with conflict blocks that show the two sets of changes one after the other, such that you could try to resolve the conflict directly in your IDE without using any kind of diff/merge tool, just by editing that file directly. But don't do that, use a proper tool.)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084520

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-04 10:44:57 CEST