{"thread":{"id":"23718","subject":"Preventing rebase confusion","startedAt":"2010-05-06T11:27:08Z","lastAt":"2010-05-06T11:27:08Z","messageCount":1,"participants":["Eli Barzilay"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"141065","messageId":"19426.42892.542935.899298@winooski.ccs.neu.edu","threadId":"23718","inReplyTo":null,"subject":"Preventing rebase confusion","fromName":"Eli Barzilay","fromEmail":"eli@barzilay.org","sentAt":"2010-05-06T11:27:08Z","receivedAt":"2010-05-06T11:27:08Z","isPatch":false,"sender":{"key":"eli@barzilay.org","avatar":"https://avatars.githubusercontent.com/u/185905?v=4"},"body":"\nTwo suggestions (provided that I have the details right):\n\n1. When I run `git rebase origin' I get helpful instructions when a\n   conflict happens:\n\n     When you have resolved this problem run \"git rebase --continue\".\n     If you would prefer to skip this patch, instead run \"git rebase --skip\".\n     To restore the original branch and stop rebasing run \"git rebase --abort\".\n\n   It would be nice if the first line said something like\n\n     When you have resolved this problem run \"git add <file>\" and then\n     \"git rebase --continue\" (no need to commit).\n\n   My guess is that this is something that confuses many people since\n   everywhere conflicts are mentioned the instructions are to `add'\n   and then to `commit'.\n\n2. If I did get confused (which can still happen if I don't read the\n   above addition) and commit the resolved files, I get this when I\n   try `git rebase --continue':\n\n     Applying: document the type of foo\n     No changes - did you forget to use 'git add'?\n\n   But of course there are no changes now...  So it would be nice if\n   the text also said:\n\n     If you've already committed then you can run \"git rebase --skip\"\n     but your commit will then replace the original \"...subject...\"\n\n   And/or maybe instructions for using reset to undo the commit and\n   let rebase --continue do it.\n\n-- \n          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:\n                    http://barzilay.org/                   Maze is Life!\n"}]}