title: Easiest way to perform incremental merge in mercurial
body: <p>I have a project, that have branched sometime. Both branches have had a lot of commits since the split, and I want to merge them into one. Simply merging the two heads is not enough because it has too many conflicts, and the merged branch is also unstable, and non-functional.</p>
  
  <p>Therefore I want to incrementally merge the two branches. By incremental I mean I take the tip of one of the branches and apply the changes from the other one one at a time. Testing each merge, and continuing if everything goes well.</p>
  
  <p>What is the easiest way to do this using mercurial?</p>