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

> Yes, you have to have a working copy of the trunk, since that will be your merge target. You right click on your trunk working copy, and merge selecting the branch as the "FROM Url".

Either something is wrong with my svn server or client, or this is a very unintuitive process. Or i'm an idiot.

So I merged all the changes from trunk into my branch working copy. I think committed all of that to the branch.

I then checked out a copy of trunk and went to do a merge a range of revisions. I select revisions 154, 159 and 160 (160 is the commit to the branch of all the code i got from trunk)

Doing this i now get a tree conflict on two files - two files which were added into trunk previously by the other dev which i have not touched. So I have no idea at all why they would be conflicting. If i merge just 154 and 159 (my two branch revisions) into trunk, that seems to work.

If i select no revisions, that sort of works. It's at least not trying to add in every file in the project. It's actually selecting revisions 153-160 it seems - which again leads to a tree conflict on those two files.

So i did a merge of revisions 153-159 and that seems to have worked.

So - am i an idiot, is this not very intuitive or is something messed up with my svn client/server? ;)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-26 00:13:57 CEST