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

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.

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.

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

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

svn resolve --accept theirs-full templates/Toto

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