10 · Version Control
Rebase
Replay your work on the latest
Rewriting a branch's history so it sits cleanly on top of the newest main, as if you'd started from there — tidier than a merge, but it rewrites history, so riskier.
Concrete example
Rebase your branch onto main to get a straight, readable timeline before merging.