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

Same issue w 1.6.x, here's what worked for me (slightly different to above answers, which did not work for me):

svn resolve --accept working templates/Toto