RE: Merging <TSVN 1.6 VS 1.7>

> Guys
>                  I have created a Branch from my trunk. Made some changes,
> Commit. Now I am going to Merged into Trunk. Let me share behavior on TSVN
> Versions:
>
> 1.6.17 > When I merged , Test merged alert me for Conflict.
>
> 1.7.2  > When I merged , Test merged DOES NOT alert me for Conflict.
>
> Why
>
> In 1.7.2 , it just overwrites changes of branch to trunk. Anyone clear me on this
> if I am wrong.

There's really nowhere near enough information to tell you that you are wrong. What type of conflict was it? A file conflict or tree conflict?

Was the 1.7.2 resulting merge correct? There is an --accept parameter on the cli but I doubt that it a default for the TSVN merge.

Did a dialog come up when you did the merge about how to handle conflicts? I usually press "resolve later" so I can go through the conflicts one at a time.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-06 17:17:03 CEST