Web lists-archives.com

git status confusing message while conflicts in interactive rebase




When have conflict in interactive rebase then git write such message:
    Auto-merging hey
    CONFLICT (content): Merge conflict in hey
    error: could not apply cd79304... 4
    Resolve all conflicts manually, mark them as resolved with
    "git add/rm <conflicted_files>", then run "git rebase --continue".
    You can instead skip this commit: run "git rebase --skip".
    To abort and get back to the state before "git rebase", run "git
rebase --abort".
    Could not apply cd79304... 4

 So git have conflict while trying to apply cd79304... 4. But `git
status` shows this message:
    interactive rebase in progress; onto a6c8075
    Last commands done (2 commands done):
       pick 0da8253 2
       pick cd79304 4
    Next command to do (1 remaining command):
       pick 47d5ec2 3
      (use "git rebase --edit-todo" to view and edit)
    You are currently rebasing branch 'master' on 'a6c8075'.
      (fix conflicts and then run "git rebase --continue")
      (use "git rebase --skip" to skip this patch)
      (use "git rebase --abort" to check out the original branch)

    Unmerged paths:
      (use "git reset HEAD <file>..." to unstage)
      (use "git add <file>..." to mark resolution)

    both modified:   hey

    no changes added to commit (use "git add" and/or "git commit -a")

And there it said that "cd79304 4" is already picked and it's in
section "Last commands done". So it's a little bit confusing.
Maybe it's better to exclude commit on which user has conflict from
"Last commands done" section. And write separate sentence containing
message like "Conflict on cd79304 4".