Git rebase vs merge: rebase for local cleanup, merge for shared branches

Never rebase a branch that others have pulled — it rewrites history and creates divergent commits. Use rebase to clean up your local feature branch before merging (squash fixup commits, reword messages). Use merge for integrating shared branches. The golden rule: rebase is for commits nobody else has seen. Violating this causes the most painful git conflicts in team environments.