#version control

The monorepo vs polyrepo debate gets treated like a religious war. It isn't. It's a tradeoff about where you want your pain. Here's how to pick without cargo-culting Google.

Merge joins two histories with a new commit. Rebase lifts your commits off the branch and replays them on top of the latest code. Get that one picture and every rebase-vs-merge argument suddenly makes sense.