Merge trunk to branch issue with folder renamed

Hi all,
I have a branch made from the trunk as usual. I have renamed some folder in the branch as part of a refactoring activity.
Now I want to merge the trunk back to the branch as some other changes have been made to the trunk and I want to get them back.
But I am getting a tree conflict as TortoiseSVN consider the files are not in the same location as the folder name change.

I am very surprise of this it is obviously something I miss but I don't know what.
So if you were having a idea or two it will be great :)
Cheers

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-06 10:41:51 CEST