title: Can't resolve tree conflict with SVN
body: <p>I recently encountered a very weird behavior of subversion. </p>
  
  <p>I just merged my local copy of a branch with a remote branch. Everything went smooth, but I've got 1 tree conflict (local delete, remote update). </p>
  
  <p>Okay, thought I, modified the working copy appropriately and ran "svn resolve --accept=working -R .". </p>
  
  <p>Subversion told that it has resolved my problems and "svn st" no longer showed any issues. So, I tried to commit, but svn told me that one of the inner folders (inside my conflicted one) was out of date and suggested to svn up, BUT it made the folder to be in conflict again!</p>
  
  <p>What shall I do to get out of this visious circle?</p>