title: Subversion post-merge tree conflict - "local delete, incoming edit upon merge"
body: <p>I did a merge between the trunk and a branch.</p>
  
  <p>On the trunk, there is a folder, let's say templates/Toto.</p>
  
  <p>On the branch, everything but the folder Toto is there (not a local delete, Toto is simply not in the repo).</p>
  
  <p>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.</p>
  
  <p>What is the <em>proper</em> way to solve this? By proper, I definitely don't mean manual copy of Toto from trunk to branch.</p>
  
  <p>I read the doc, but I'm still stuck.</p>