title: Conflict resolution with Emacs Ediff: How can I take the changes of both versions
body: <p>(Question adapted from <a href="https://stackoverflow.com/questions/8710367/how-do-i-combine-the-two-variants-of-a-conflict-in-emacs-emerge">How do I combine the two variants of a conflict in emacs&#39; emerge?</a>)</p>
  
  <p>I have a file with merge conflict markers. It looks similar to this:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
              522ADC9C14B2FD9D00F56BAD /* close_test_button.png in Resources */,
              522ADC9D14B2FD9D00F56BAD /* close_test_button@2x.png in Resources */,
              522ADCA014B2FDB100F56BAD /* test_failed.png in Resources */,
              522ADCA114B2FDB100F56BAD /* test_failed@2x.png in Resources */,
  =======
              EC1633C014B2F3E3004B52E7 /* arrow.png in Resources */,
              EC1633C114B2F3E3004B52E7 /* arrow@2x.png in Resources */,
              EC1633C214B2F3E3004B52E7 /* groups.png in Resources */,
              EC1633C314B2F3E3004B52E7 /* groups@2x.png in Resources */,
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; beta_2.8
  </code></pre>
  
  <p>I use <em>M-x vc-resolve-conflicts</em> to start <a href="http://www.gnu.org/software/emacs/manual/ediff.html" rel="noreferrer">Ediff</a>. I can select variant <em>A</em> or <em>B</em> by hitting <em>a</em> or <em>b</em> on my keyboard, but how do I combine both variants, one after the other?</p>