title: Re-use conflict resolution with Git
body: <p>Can I tell Git to re-use the conflict resolution from an existing merge commit? I had rerere disabled at the time of commit. The new merge commit contains a few additional commits on the "ours" side of the merge (but they should not introduce new conflicts as they modified a different set of files).</p>
  
  <hr>
  
  <p>For instance, take the following DAG:</p>
  
  <pre><code>m [master] Add new stuff
  *
  | o [old-master] Merge branch A (conflicts)
  |/a [branch A]
  n *
  * *
  */
  *
  </code></pre>
  
  <p>Now, what I want to do is to bring commits <code>m</code> and <code>m^</code> into the branch <code>old-master</code> (and later make that the new master). I don't want to simply merge <code>master</code> into <code>old-master</code>, since it will create a new merge commit (albeit without conflicts). I want to recreate commit <code>o</code> with <code>m</code> and <code>a</code> as parents.</p>
  
  <p>The new DAG should look like:</p>
  
  <pre><code>  p [old-master] Merge branch A (same conflict resolution as old commit o)
   /|
  m | [master] Add new stuff
  * |
  | a [branch A]
  n *
  * *
  */
  *
  </code></pre>
  
  <p>I don't mind using rerere, if I can tell it afterwards to record the resolution of the existing merge commit (<code>o</code>).</p>