Lesson 9 / 20
Merge Strategies
Compare merge commit, squash and rebase strategies and choose the one that keeps history clear.
Merge commit
Creates a merge commit that preserves the full branch history — GitHub's default option.
Squash and merge
Combines every commit on the branch into a single commit on the base branch — keeps main's history clean and linear.
Rebase and merge
Replays the branch's individual commits onto the tip of the base branch without creating a merge commit — linear history, full commit detail.