Finish an abandoned rebase
An agent stopped halfway. The repository is not broken.
A rebase interrupted by a conflict leaves a real, understandable state: HEAD detached on the new base, some commits already replayed, one conflicted in the index, and the rest waiting.
git status tells you exactly where you are, including which commit it was applying and how many remain. Resolve the file, stage it, and git rebase --continue.
git rebase --abort puts everything back to before the rebase started, at any point. There is no state here you cannot leave.
Commands in this lesson
git rebase --continue- Carry on with a rebase after resolving and staging a conflict
git rebase --abort- Stop a rebase and put the branch back where it started
git status- Report the two gaps: HEAD against the index, and the index against your files