On Thu, Jun 01, 2017 at 02:13:10PM -0700, Stefan Beller wrote: > > > >> $ 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. Yeah, I was going to suggest the same thing. "git apply" is much pickier than "patch" about fuzzing the hunks (intentionally so, because the results can sometimes end up not what the sender intended). But in most cases "-3" can apply the patch without losing safety (unless the sender built off a branch that you don't even have). There's some more discussion of --3way as the default in http://public-inbox.org/git/CAKwvOdn9j=_Ob=xq4ucN6Ar1G537zNiU9ox4iF6o1qO7kPY41A@xxxxxxxxxxxxxx/T/#u -Peff