title: Subversion Merge - Possible to Ignore Merge History?
body: <p><strong>My basic problem is that I'm trying to re-merge trunk and a branch in Subversion 1.6, ignoring any previous merge history.</strong>  My scenario is as follows:</p>
  
  <ol>
  <li>I have a project in <strong>trunk</strong>. </li>
  <li>I created a branch at <strong>branches/branch-A</strong></li>
  <li>Work continue on <strong>trunk</strong> and on <strong>branch-A</strong></li>
  <li>Since <strong>branch-A</strong> was a pretty big change, I have used TortoiseSVN to "<strong>Merge a range of revisions</strong>" from <strong>trunk</strong> to <strong>branch-A</strong> every week or so.  There were conflicts and I manually resolved them as they occurred.</li>
  </ol>
  
  <p>At this point, <strong>branch-A</strong> should contain everything in trunk, plus the new feature.  This is mostly working but I'm seeing an issue that works in <strong>trunk</strong> and does not work in <strong>branch-A</strong>.  This makes me think that I incorrectly resolved a conflict in an earlier merge.  </p>
  
  <p>I'd like to do a merge that ignores my previous merge history and just does a straight <strong>trunk</strong> vs. <strong>branch-A</strong> diff.  When I try any merge now, it takes the merge history into account and does not show me any diffs for the conflicts I resolved earlier.  <strong>Is this possible to ignore all previous merge history and just get an branch-A-vs.-trunk diff-merge?  Am I going about this incorrectly?</strong></p>
  
  <p>Notes: </p>
  
  <ul>
  <li>I have tried to "merge a series of revisions" and "ignore ancestry" with no success.  </li>
  <li>I do not care about keeping track of revisions in the branch.  When it is reintegrated, I'm planning to do it as one big merge revision for the new feature.  </li>
  <li>I'm trying to "reintegrate" instead of "merge revisions" at the moment but it's going to take a while to run so I'm not sure if that's the magic bullet.</li>
  </ul>
  
  <p><strong>UPDATE: The consensus seems to be that the "merge revisions" and "ignore ancestry" options should have given me what I asked for.  I ran the merge again and I got a nonsense tree conflict and nothing else, so I am going to assume that I fell into an edge case somewhere where the merge was not doing what it should have.  I knew approximately where the error should be so I ended up just diffing the entire trunk vs. the branch using DiffMerge, then finding and fixing the error manually.  Not clean but it worked.</strong>  </p>