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

Problem merging changes from Branches to Trunk

From: Felipe, Ramon <ramon.felipe_at_wamu.net>
Date: Wed, 9 Jan 2008 15:28:22 -0800



When I merge my Branch to the Trunk the files on the trunk are getting
overwritten. It is doing an "update" instead of "merging" the file


To make sure it has nothing to do with my existing revisions and working
copies, I create a clean repository from scratch just to test. And sure
enough it is updating the trunk instead of merging.


I tried googling this and searching forums with no luck, which is
surprising. Any help is appreciated.


Received on 2008-01-10 00:29:23 CET

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.