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

I used tortoise to make the branch.

Right clicked on the project folder, selected branch/tag, typed in the branch path /branches/mybranch, and i ticked off the box to switch the working copy to the new branch/tag

revision 153 in the log shows as the creation of the branch, specifically the log shows:
path - action - copy from path - revision
/branches/mybranch - added - /trunk - 152

I seem to be able to be able to get all the changes from trunk into the branch. But when i try then push all the changes from branch to trunk, it's instead replacing the files i updated with the older version of those files from trunk.

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

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