Skip to content

Rebase vs Merge

Git

Understand when to rebase vs merge: history cleanliness vs safety.

Official Site
01

Overview

Merge preserves branch history (merge commit). Rebase replays commits on top of target (linear history). Rebase rewrites history (new commit hashes). Never rebase shared/public branches. Squash + rebase for clean PRs.

bash
# Merge (safe, preserves history)
git merge feature
# Rebase (clean, linear)
git rebase main
# Interactive rebase (squash, reorder)
git rebase -i HEAD~3
# After rebase, force-push your branch
git push --force-with-lease
02

Best Practices

Rebase local branches before merging for clean history. Never rebase public/shared branches (rewrites history). Use --force-with-lease (safer than --force). Interactive rebase to squash/reorder commits. Merge for integration, rebase for cleanup.))

Ready to try Rebase vs Merge?

Visit the official site for the latest version and full documentation.

Visit Rebase vs Merge