title: Subversion - Merge skipping duplicate file name and not restoring
body: <p>Apologies if this is answered, but I waded through a bunch of articles before I decided to post this.</p>
  
  <p>So I have a branch and the main trunk and I was experimenting with Merging.</p>
  
  <p>/trunk/Blah
  /branch/Blah/FeatureA</p>
  
  <p>So I create a file "test.txt" in the branch and commited it.
  I then accidentally created a file "test.txt" in the trunk</p>
  
  <p>Later I attempt to merge the feature A branch to the main trunk.</p>
  
  <p>It gives me the error</p>
  
  <pre><code>Skipped 'Test.txt'
  Summary of conflicts:
    Skipped paths: 1
  </code></pre>
  
  <p>When merging.</p>
  
  <p>So I realize it's because the main trunk had a non-sensical copy of the file. I delete the file from the trunk and re-run the merge command and it gives me zero output. </p>
  
  <p>If I run the merge with the --dry-run, it too returns no output</p>
  
  <p>If I run the diff command with the same arguments it shows the file Test.txt and that it intends to add.</p>
  
  <p>So I ran off and did the test again but this time with "test2.txt". I made sure that the trunk didn't have a file named "test2.txt". I ran the merge and it ran perfectly.</p>
  
  <p>So my question is, when I do accidentally have a file in the trunk with the same name that causes a conflict. </p>
  
  <p>How do I get subversion to </p>
  
  <ol>
  <li>Raise a conflict and ask me if it wants to replace or edit the conflict</li>
  <li>Allow me to rename/delete the file so that I can simply re-run the merge and it works</li>
  </ol>
  
  <p>Thanks!</p>
  
  <p>** EDIT - With Answer **</p>
  
  <p>I had a second set of eyes, apparently I neglected to add the --ignore-ancestry flag on my merge command. Once I added that, everything worked perfectly</p>