Merge creates a merge commit that joins two branches, preserving full history. Rebase replays your commits on top of the target branch, creating a linear history. Use rebase for feature branches before merging. Never rebase shared/public branches.