title: What is the best way for distributed conflict resolution during merge in git? (deliberate partial commit)
body: <p>Assume the following:</p>
  <ol>
  <li><p>A team of several designers (DesignerA,DesignerB,DesignerC ...).</p>
  </li>
  <li><p>Main branch <code>master</code></p>
  </li>
  <li><p>Two feature branches <code>featureA</code>, <code>featureB</code>.</p>
  </li>
  <li><p>In featureA:<br />
  4.1. DesignerA Modified <code>./fileA</code>.<br />
  4.2. DesignerB Modified <code>./fileB</code>.<br />
  4.3. DesignerC Modified <code>./fileC</code>.</p>
  </li>
  <li><p>In featureB:<br />
  5.1. DesignerA Modified <code>./fileA</code>.<br />
  5.2. DesignerB Modified <code>./fileB</code>.<br />
  5.3. DesignerC Modified <code>./fileC</code>.</p>
  </li>
  <li><p>DesignerC merges <code>featureA</code> + <code>featureB</code> into <code>master</code>:<br />
  6.1. merge <code>featureA</code> to <code>master</code>:<br />
  <code>fileA</code>,<code>fileB</code> and <code>fileC</code>'s changes are automatically merged.</p>
  <p>6.2. merge <code>featureB</code> to <code>master</code>:
  <code>fileC</code>'s conflict resolved by DesignerC
  <code>fileA</code>+<code>fileB</code> are conflicted but DesignerA owns fileA and DesignerB owns fileB.</p>
  </li>
  </ol>
  <p>My question:</p>
  <p><strong>How can DesignerC pass the partially merged commit and let each designer to solve his own conflicts?</strong></p>
  <p>say:</p>
  <ul>
  <li>Send to designerA :
  <ul>
  <li>resolved <code>fileC</code></li>
  <li>unresolved <code>fileA</code> - to handle</li>
  <li>unresolved <code>fileB</code> - to leave unresolved</li>
  </ul>
  </li>
  <li>Send to designerB :
  <ul>
  <li>resolved <code>fileC</code></li>
  <li>unresolved <code>fileA</code> - to leave unresolved</li>
  <li>unresolved <code>fileB</code> - to handle</li>
  </ul>
  </li>
  <li>Merge resolutions and push to master.</li>
  </ul>
  <p>NOTE:</p>
  <ul>
  <li>The team tries to use git as simply as possible - please avoid fancy gitting in answers :)</li>
  <li>The solution of <a href="https://stackoverflow.com/questions/25718477/how-to-manage-a-code-merges-on-git-with-multiple-users">temporary branches</a> is not the one I am looking for.</li>
  </ul>