Re: Re: Merge problem SVN 1,8

On Fri, Jul 4, 2014 at 7:02 AM, Markus Humm <markus.humm_at_de.ebmpapst.com> wrote:
> since we do not want to do a automatic merge, we do not need a 3-way diff/merge tool.

Explain.

A 3-way merge tool is mostly useful for doing manual merges; that way
you can see what CHANGED in each version compared to a common
ancestor, not just what is different between two versions. Why do you
think it would only be useful for automatic merges? True a good 3-way
tool will automatically try to select some differences for you, but
you can always override that, or you can often configure it to not
make any automatic selections.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-04 18:13:33 CEST