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

Merging <TSVN 1.6 VS 1.7>

From: Waseem Shahzad <waseem.shahzad_at_curemd.com>
Date: Fri, 6 Apr 2012 10:39:15 -0400


                 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.




In 1.7.2 , it just overwrites changes of branch to trunk. Anyone clear
me on this if I am wrong.




Waseem Bukhari



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-06 16:39:59 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.