RE: Re: Re: Merge problem SVN 1,8

Hello,

I read the link provided, but it doesn't explain the reason why a 3-way merge is necessary. It only claims that it's necessary and which files are involved.

I really like to understand in which scenarios I or a merge tool needs the contents from the base file.

What _exactly_ is the difference between a conflict during reintegration and a conflict during update?

And in which scenarios is content from the base file during a reintegration necessary? (means which kinds of edits do lead to this requirements?)

And why are no conflict markers in my foo.c file in my example?

I really want to understand these things.

Regards

Markus Humm

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-10 13:21:12 CEST