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

RE: Confused about how to merge changes from branch to trunk

From: Ian L <misc_at_imerk.com>
Date: Wed, 25 Sep 2013 12:14:23 -0700 (PDT)

actually, merging from branch back into trunk messed things up - all the files in my working copy that i changed, have been replaced with the unmodified versions of those files from the trunk.

I made backup copies of the repository and my working copy before doing any of this so I can easily undo this. But I'd like to know the correct way to handle this so i can do it correctly in the future.

Thanks again


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 21:14:26 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.