How to resolve tree conflict with duplicate directories?

Hi, we're running into a tree conflict that appears to be caused by directories with the same name having been added independently to two branches. The basic scenario is that we have a trunk and a feature branch that was branched from trunk:

/trunk
/branches/feature

A directory with the same name was created independently on each branch:

/trunk/newdirectory
/branches/feature/newdirectory

Now when we merge trunk into the feature branch, we get a tree conflict on newdirectory.

How do we resolve this? All the documentation I've seen so far talks about files being deleted. I haven't found anything that covers this scenario.

Thanks for any help you can provide.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-12 19:30:33 CEST