Github's Git flow (not git-flow)
At Granicus, we've been using git-flow with success. Though, recently, a teammate came across Github flow, which is slightly different branching and merging strategy, using Git.
I especially like the internal Pull Request which prompts a code review and conversation. Creating more, smaller branches, has been very beneficial for our productivity: quality and throughput.
Tagsprogramming, git, and workflow