title: How can I "force" a branch upon the trunk, in the case I can't "reintegrate"?
body: <p>We created a branch from the trunk on which a major refactoring was done. Meanwhile, the trunk advanced a few revisions with some fixes. We <strong>don't</strong> want these changes on the branch, so we don't want to "catch-up" merge the trunk to the branch, because we don't want to mix the old and new code. But without this I can't reintegrate the branch back to the trunk.</p>
  
  <p>Is there a way to impose the branch on the trunk "as-is"?</p>
  
  <p>(An idea I considered is to undo ("reverse-merge") the trunk back to the revision where the branch started, and then it is safe to merge it on branch - nothing should happen. Then I can reintegrate. What do you think?)</p>