{"thread":{"id":"50312","subject":"git status confusing message while conflicts in interactive rebase","startedAt":"2019-01-24T21:15:36Z","lastAt":"2019-01-24T21:15:36Z","messageCount":1,"participants":["Nikita Bobko"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"367602","messageId":"CAMJzOtyieMX1WiXy72sWZPSW6kcBF__-Q7wDULRSyHrOuG6RbA@mail.gmail.com","threadId":"50312","inReplyTo":null,"subject":"git status confusing message while conflicts in interactive rebase","fromName":"Nikita Bobko","fromEmail":"nikitabobko@gmail.com","sentAt":"2019-01-24T21:15:21Z","receivedAt":"2019-01-24T21:15:36Z","isPatch":false,"sender":{"key":"nikitabobko@gmail.com","avatar":null},"body":"When have conflict in interactive rebase then git write such message:\n    Auto-merging hey\n    CONFLICT (content): Merge conflict in hey\n    error: could not apply cd79304... 4\n    Resolve all conflicts manually, mark them as resolved with\n    \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n    You can instead skip this commit: run \"git rebase --skip\".\n    To abort and get back to the state before \"git rebase\", run \"git\nrebase --abort\".\n    Could not apply cd79304... 4\n\n So git have conflict while trying to apply cd79304... 4. But `git\nstatus` shows this message:\n    interactive rebase in progress; onto a6c8075\n    Last commands done (2 commands done):\n       pick 0da8253 2\n       pick cd79304 4\n    Next command to do (1 remaining command):\n       pick 47d5ec2 3\n      (use \"git rebase --edit-todo\" to view and edit)\n    You are currently rebasing branch 'master' on 'a6c8075'.\n      (fix conflicts and then run \"git rebase --continue\")\n      (use \"git rebase --skip\" to skip this patch)\n      (use \"git rebase --abort\" to check out the original branch)\n\n    Unmerged paths:\n      (use \"git reset HEAD <file>...\" to unstage)\n      (use \"git add <file>...\" to mark resolution)\n\n    both modified:   hey\n\n    no changes added to commit (use \"git add\" and/or \"git commit -a\")\n\nAnd there it said that \"cd79304 4\" is already picked and it's in\nsection \"Last commands done\". So it's a little bit confusing.\nMaybe it's better to exclude commit on which user has conflict from\n\"Last commands done\" section. And write separate sentence containing\nmessage like \"Conflict on cd79304 4\".\n"}]}