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

Question

Dear stackers,

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 (not a local delete, Toto is simply not in the repo).

After I performed the merge (I tried several times), I always end up with a freaking tree conflict "local delete, incoming edit upon merge". However, as I stated, this is NOT a local delete.

What is the proper way to solve this ? By proper, I definitely don't mean manual copy of Toto from trunk to branch. I read the doc, but I'm still stuck.

Any help would be greatly appreciated.

Thanks in advance, Rolf

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.