title: git: How to apply a conflicting patch?
body: <p>I've got a patch that i would like to apply to my local tree. It's generated using <code>git format-patch</code>. It contains some conflicts, so I use the following to apply it:</p>
  
  <p><code>$ git apply --3way mypatch.patch</code></p>
  
  <p>This way, when I apply it, I can open the files that failed to merge, and to so by hand.
  However, once I have done that, I would like to "finish" applying the patch - I mean, I'd like to tell git "ok, I've finished manually resolving the conflicts - now go ahead and apply this patch with the commit message as it is in the patch, and the author that is specified in the patch".</p>
  
  <p>However it seems that once there's a merge conflict, git just gives up and leaves everything to you. Is there a way to tell git, "Hey, for this commit, please take the commit message and authorship details from this patch"? Or a way to tell git, "You can continue the patch application process as normal"?</p>