{"thread":{"id":"26242","subject":"No way to resolve git am conflicts.","startedAt":"2011-01-08T13:11:54Z","lastAt":"2011-01-08T19:21:42Z","messageCount":3,"participants":["Stephen Kelly","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"159213","messageId":"ig9nqq$4ib$1@dough.gmane.org","threadId":"26242","inReplyTo":null,"subject":"No way to resolve git am conflicts.","fromName":"Stephen Kelly","fromEmail":"steveire@gmail.com","sentAt":"2011-01-08T13:11:54Z","receivedAt":"2011-01-08T13:11:54Z","isPatch":false,"sender":{"key":"steveire@gmail.com","avatar":null},"body":"\nkde-devel@bishop:~/dev/src/git{master}$ curl -o the.patch \nhttp://download.gmane.org/gmane.comp.version-control.git/164809/164810 && \ngit am the.patch\n  % Total    % Received % Xferd  Average Speed   Time    Time     Time  \nCurrent\n                                 Dload  Upload   Total   Spent    Left  \nSpeed\n100 10438    0 10438    0     0  12046      0 --:--:-- --:--:-- --:--:-- \n13451\nApplying: Introduce new configuation option to override committer \ninformation\nerror: patch failed: builtin/commit.c:1352\nerror: builtin/commit.c: patch does not apply\nPatch failed at 0001 Introduce new configuation option to override committer \ninformation\nWhen you have resolved this problem run \"git am --resolved\".\nIf you would prefer to skip this patch, instead run \"git am --skip\".\nTo restore the original branch and stop patching run \"git am --abort\".\nQt( 4.7 ) KDE ( 4.6 ) \nkde-devel@bishop:~/dev/src/git{master}$ git diff\nQt( 4.7 ) KDE ( 4.6 ) \nkde-devel@bishop:~/dev/src/git{master}$ git status\n# On branch master\n# Untracked files:\n#   (use \"git add <file>...\" to include in what will be committed)\n#\n#       p.patch\n#       the.patch\nnothing added to commit but untracked files present (use \"git add\" to track)\nQt( 4.7 ) KDE ( 4.6 ) \nkde-devel@bishop:~/dev/src/git{master}$ \n\nAs git status doesn't tell me what the conflict is, I can't resolve it.\n"},{"id":"159225","messageId":"20110108163633.GB28898@burratino","threadId":"26242","inReplyTo":"ig9nqq$4ib$1@dough.gmane.org","subject":"Re: No way to resolve git am conflicts.","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2011-01-08T16:36:33Z","receivedAt":"2011-01-08T16:36:33Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Stephen Kelly wrote:\n\n> git am the.patch\n[...]\n> Applying: Introduce new configuation option to override committer \n> information\n> error: patch failed: builtin/commit.c:1352\n> error: builtin/commit.c: patch does not apply\n> Patch failed at 0001 Introduce new configuation option to override committer \n> information\n> When you have resolved this problem run \"git am --resolved\".\n> If you would prefer to skip this patch, instead run \"git am --skip\".\n> To restore the original branch and stop patching run \"git am --abort\".\n> $ git diff\n[...]\n> As git status doesn't tell me what the conflict is, I can't resolve it.\n\nHave you tried \"git am -3\" or \"git am --reject\" (after \"git am\n--abort\")?\n\nI agree that the hints printed are suboptimal in this case.  Please\nfeel free to make them better if you have time for it. :)\n"},{"id":"159231","messageId":"igadg7$4tb$1@dough.gmane.org","threadId":"26242","inReplyTo":"20110108163633.GB28898@burratino","subject":"Re: No way to resolve git am conflicts.","fromName":"Stephen Kelly","fromEmail":"steveire@gmail.com","sentAt":"2011-01-08T19:21:42Z","receivedAt":"2011-01-08T19:21:42Z","isPatch":false,"sender":{"key":"steveire@gmail.com","avatar":null},"body":"Jonathan Nieder wrote:\n\n> Stephen Kelly wrote:\n> \n>> git am the.patch\n> [...]\n>> Applying: Introduce new configuation option to override committer\n>> information\n>> error: patch failed: builtin/commit.c:1352\n>> error: builtin/commit.c: patch does not apply\n>> Patch failed at 0001 Introduce new configuation option to override\n>> committer information\n>> When you have resolved this problem run \"git am --resolved\".\n>> If you would prefer to skip this patch, instead run \"git am --skip\".\n>> To restore the original branch and stop patching run \"git am --abort\".\n>> $ git diff\n> [...]\n>> As git status doesn't tell me what the conflict is, I can't resolve it.\n> \n> Have you tried \"git am -3\" or \"git am --reject\" (after \"git am\n> --abort\")?\n\ngit am -3 worked, thanks.\n\n> \n> I agree that the hints printed are suboptimal in this case.  Please\n> feel free to make them better if you have time for it. :)\n"}]}