Git Rebase vs Merge

What is the difference between git rebase and git merge? When would you use each?

Gitbeginner

// interview question

What is the difference between git rebase and git merge? When would you use each?

Sample answer

Merge creates a new commit combining two branches, preserving history. Rebase rewrites history by moving commits to a new base, creating a linear history. Use merge for shared branches to preserve context; use rebase for feature branches to keep history clean. Never rebase commits that have been pushed to shared branches.

Why this matters

Both achieve branch integration but with different history outcomes. Merge is safer and preserves the complete development timeline. Rebase creates cleaner history but rewrites commits, which can cause issues if others have based work on those commits.

Code examples

Merge workflow

bash

# Merge feature into main
git checkout main
git merge feature-branch

# Creates merge commit: A-B-C-M (where M merges F1-F2)
#                        \   /
#                         F1-F2

Rebase workflow

bash

# Rebase feature onto main
git checkout feature-branch
git rebase main

# Before: A-B-C (main)
#          \
#           F1-F2 (feature)

# After:  A-B-C-F1'-F2' (linear history)

# Interactive rebase to clean up commits
git rebase -i HEAD~3  # Squash, reword, reorder