resolving tree conflicts

Hi,

I have a situation where there has been lots of reorg (file moves and renames) on a branch that I want to sync down to the trunk. When I perform the merge (Tortoise 1.6.3, although server is still on 1.6.2) I get a lot of tree conflicts (about 200) due to the moved files being changed on the trunk. It is my understanding that the moved files that are added in my trunk working copy are directly from the branch and will not have the trunk changes incorporated.

I would be eternally grateful if someone could give me a heads up as to how to resolve these problems as I've been playing about with this for a couple of days and I'm not confident I know what I'm doing and am getting increasingly frustrated.

Cheers,
James

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2370883

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-13 13:18:53 CEST