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

svn merge conflict
fbiville picture fbiville · Sep 23, 2010 · Viewed 38.9k times · Source

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.

Answer

zellus picture zellus · Sep 23, 2010

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.

Related questions

How to set kdiff3 as merge tool for SVN

I would like to be able to resolve conflicts using kdiff3, when SVN notifies me about the conflict. How can I set it as a default tool for this?

Read More
Why am I getting tree conflicts in Subversion?

I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the …

Read More
Merge a Branch into Trunk

I'm facing a peculiar problem with SVN merge. I want to merge from a dev branch to trunk. We have multiple dev branches cut off the trunk at the same time. I'm merging one of those branches to trunk with …

Read More