Rebase and Conflicts

Merging records history as it happened; rebasing rewrites it into the history you wish had happened. This section builds pagination for BookNest's catalog on a branch whose commits are as messy as real work, then tidies them, replays them onto a moving main, and resolves the conflict that follows.

Subsections

• Rebase vs Merge
• Rebasing onto Main
• Interactive Rebase
• Splitting Commits
• Autosquash and Fixup Commits
• Rebase Conflicts
• rerere
• Abort and Continue
• Never Rebase Shared History
• Merge Tools