Everything we have written
on Rebase

Git Rebase vs Merge: When to Use Each

How git merge and git rebase differ, what each does to your history, when to use each one, and the one rule that keeps rebasing safe on a team.