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

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 21:14:26 CEST