Advanced Git: Debugging, History Rewriting, and Submodules

Rebase = replay: Git takes the commits on your branch that are not on the target ( feature-sqrt commits not on main ), computes their patches, resets the branch pointer to the target tip, and replays each patch as a new commit on top.
New SHAs: Because each replayed commit has a new parent, its SHA is different. Old commits remain in .git/objects and git reflog — nothing is ever truly lost, but anyone who fetched the old SHAs sees divergence.
Fast-forward merge: After a successful rebase, the feature branch is a strict extension of main. git merge feature-sqrt on main simply moves the main pointer forward — no merge commit.
Rebase conflicts (Task 5): When upstream and your branch touched the same lines, rebase pauses at the first problem commit. Resolution is identical to a merge conflict — edit the file, remove markers, git add , then git rebase --continue ( not git commit ). git rebase --abort bails out at any point.
The rule: rebase only local/private branches. Rewriting pushed history requires --force-with-lease and annoys everyone who already pulled.

Delete saved progress?

Do you want to delete all saved progress for this tutorial and reset the current step files?

Selecting No will just turn off auto-save — your progress is kept but won't be updated.

Reading aloud 1.0x