[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merging <TSVN 1.6 VS 1.7>

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 6 Apr 2012 11:17:17 -0400

> 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.



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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.