Modern QA2026Squash Merge — tiles
Log inJoin
15 / 57 · 17 Git & Version Control · Rebase vs Merge← prev⊞ allnext →☰ Read as one page

2.7Squash Merge

Many teams use squash merge when completing PRs. A squash merge combines all PR commits into a single commit on main.

# GitHub PR merge options:
# 1. Create a merge commit (preserves all commits)
# 2. Squash and merge (combines into one commit)
# 3. Rebase and merge (linear history, preserves individual commits)

QA preference: Squash merge is usually best for feature branches. It keeps main history clean (one commit per feature), and the detailed commit history is preserved in the PR itself.