title: Git commit incomplete merge
body: <p>Is there a way to commit an incomplete merge? I've resolved half the conflicts. The other half my colleague is much better qualified to deal with.</p>
  
  <p>Perhaps equally good, or even better, would be to take conflict chunks and restore them to files in a conflicted state. Then I could commit the merge with the conflict chunks and my colleague could grab it, return the files to a "conflict" state, and take it from there.</p>