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

What version(s) of subversion are you using on the client and server side? Version 1.4.x on the server and 1.6.x on the client may end up in 'tree errors'.

Referring to SVN how to resolve new tree conflicts when file is added on two branches

svn resolve --accept working

might do the job.