[jsunderland323]

Exactly! This was actually Linus' point when he was explaining git to companies still on cvs. "You're all already using branches anyway".

I think if you're in a low-trust enterprise environment, branches kind of make sense because you get the additional scrutiny of code-review and merges occur on a centralized server but if you're in a four person team where you trust everyone just use the main branch and resolve locally.

> Remember, git replaced tarballs

I would refine that to say 3-way-merging replaced tarballs but yes!