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

svn resolve --accept theirs-full templates/Toto

This should bring it the folder from trunk w/out you having to manually copy it