Stephen Kelly wrote: > git am the.patch [...] > Applying: Introduce new configuation option to override committer > information > error: patch failed: builtin/commit.c:1352 > error: builtin/commit.c: patch does not apply > Patch failed at 0001 Introduce new configuation option to override committer > information > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > $ git diff [...] > As git status doesn't tell me what the conflict is, I can't resolve it. Have you tried "git am -3" or "git am --reject" (after "git am --abort")? I agree that the hints printed are suboptimal in this case. Please feel free to make them better if you have time for it. :) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html