At my current company, we use a lightly-modified GitFlow workflow: https://www.atlassian.com/git/workflows#!workflow-gitflow https://www.atlassian.com/git/work

At my current company, we use a lightly-modified GitFlow workflow: https://www.atlassian.com/git/workflows#!workflow-gitflow https://www.atlassian.com/git/workflows#!workflow-gitflow Previously, at my startup, we used long-running feature branches and merged to mainline as seemed reasonable. Branches are pretty much the only reason to use git--and a damned fine reason they are.