Practice this fail.
Conflict resolved. Now what?
Git · Restart as often as you like
Read the error, choose a command, and learn
why it works. Nothing runs on your machine.
A rebase stopped on a conflict. You resolved it and staged the resolved files. Continue this existing rebase.
Conflict resolved. Now what?
$ git status
rebase in progress; all conflicts fixed
How do you resume the interrupted rebase?
Fixed. By hand.
git rebase --continueAfter staging resolved conflicts, --continue resumes the rebase. --skip discards the current patch from the replay; it is not a generic way to acknowledge a resolution.
Practice does not affect your daily score or streak.