[bonzoq]

Just make sure to rebase every time you start work to avoid merge conflicts, but yes, this is the single most effective git workflow for small and probably larger teams too! I'm in a small team where the lead dev comes from a top SV company and he introduced this workflow and it works great.

[blisse]

Are you being serious or sarcastic?

[yxhuvud]

I'd assume he is serious. It is a lot simpler to avoid merge conflicts that are hard to solve if you always rebase first.