When git-am fails to apply a patch, then
git-am --3way
will cause it to try a 3-way merge. This lets you manually edit the conflicted sections before running git-add for the conflicted files, and
git-am --resolved
to move to the next patch. Of course, sometimes it’s able to do the merge and you don’t have to do anything! Thanks – http://home.regit.org/?page_id=32
David Gleich: a notebook 