> >> $ git am /tmp/original_msg.txt >> Applying: fsmonitor: add documentation for the fsmonitor extension. >> error: patch failed: Documentation/githooks.txt:448 >> error: Documentation/githooks.txt: patch does not apply >> Patch failed at 0001 fsmonitor: add documentation for the >> fsmonitor extension. >> The copy of the patch that failed is found in: >> .git/rebase-apply/patch >> When you have resolved this problem, run "git am --continue". >> If you prefer to skip this patch, run "git am --skip" instead. >> To restore the original branch and stop patching, run "git am >> --abort". Try again with -3. (We should make that the default for am, maybe?) It helped me for most of the conflicts that I saw.