{"thread":{"id":"50901","subject":"Advice setting for git rebase","startedAt":"2019-04-09T14:32:45Z","lastAt":"2019-04-09T14:32:45Z","messageCount":1,"participants":["Robert Dailey"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"373490","messageId":"CAHd499C1x+S7vwGzqV4=DFBoKVuY+jO6Jts94tb_g4FW3sD20A@mail.gmail.com","threadId":"50901","inReplyTo":null,"subject":"Advice setting for git rebase","fromName":"Robert Dailey","fromEmail":"rcdailey.lists@gmail.com","sentAt":"2019-04-09T14:32:29Z","receivedAt":"2019-04-09T14:32:45Z","isPatch":false,"sender":{"key":"rcdailey.lists@gmail.com","avatar":null},"body":"When I perform a rebase and it stops at a commit due to a conflict,\nthe messages printed are very verbose. Example:\n\n```\nApplying: Delete run configuration for zPayServiceStandalone\nUsing index info to reconstruct a base tree...\nA       .idea/runConfigurations/zPayServiceStandalone.xml\nFalling back to patching base and 3-way merge...\nCONFLICT (rename/delete):\n.idea/runConfigurations/zPayServiceStandalone.xml deleted in Delete\nrun configuration for zPayServiceStandalone and renamed to\n.idea/runConfigurations/MSRServiceStandalone.xml in HEAD. Version HEAD\nof .idea/runConfigurations/MSRServiceStandalone.xml left in tree.\nerror: Failed to merge in the changes.\nPatch failed at 0005 Delete run configuration for zPayServiceStandalone\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git\nrebase --abort\".\n```\n\nBasically everything after the \"error: Failed to merge in the changes\"\nline should be hidden by an advice setting of some sort. However,\nreviewing the config documentation shows that there is no such option,\nor at least, none that I see. I pulled up the code base for Git and\nsaw that some of these strings come from rebase.c, and it is added as\na `--resolvemsg` option. But I don't see anything that tries to read a\nconfig setting before pushing that argument.\n\nAlso if you attempt to `rebase --continue`, for example, instead of\n`rebase --skip`, you get similar help messages from the `am.c` file:\n\n```\nApplying: Delete run configuration for zPayServiceStandalone\nNo changes - did you forget to use 'git add'?\nIf there is nothing left to stage, chances are that something else\nalready introduced the same changes; you might want to skip this patch.\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git\nrebase --abort\".\n```\n\nAgain, I didn't see an option to disable this advice.\n\nCan anyone confirm if there is a setting to disable this advice or\nnot? A lot of the underlying machinery is shared between commands it\nseems, so there might be a setting that isn't straightforward. Adding\na setting for this seems relatively easy, so with some advice I might\nbe willing to contribute a patch. Let me know, and thank you.\n"}]}