The core idea

Two ways to combine work.

Merge joins two lines with a merge commit. Rebase replays your commits on top of another branch, as if you'd started from there.