title: Getting weird conflict message when trying to merge into my branch
body: <p>I am using visual SVN as my server and tortise svn as my client to do all my branching, merging, and etc. The structure is similar to below of the trunk and branches</p>
  
  <pre><code>ROOT
   /trunk
   |
    ---/trunk files
   /branches
    |
     ----/my_branch
                   |
                    ----/branch_files
    |
     ----/other_branch
                       |
                         ----/branch_files
  </code></pre>
  
  <p>When I try to do a merge of my_branch with other_branch using the range of revisions I get the following error, <code>The last merge operation tried to replace the directory ", but the directory was already edited.</code> Then the options I have for the conflict are: <code>"Accept current working copy state (mark as resolved)"; :Postpone all remaining conflicts"; "Resolve later"; "abort merge"</code> and no matter which ever option I select the merge never completes. How may I go about solving this conflict?</p>