Subversion post-merge tree conflict - “local delete, incoming edit upon merge”

Question

I did a merge between the trunk and a branch.

On the trunk, there is a folder, let\'s say templates/Toto.

On the branch, everything but the folder Toto is there

Answer 1

If the following doesn't work (it didn't for me), try it through the IDE. I tried it through Netbeans and it worked.

First select the directory and resolve conflicts. It automatically asks whether you want to accept your working directory structure.

svn resolve --accept working templates/Toto