We're moving to git flow

Team Drupal at Torchbox has been using sort-of git flow for ages. Basically, we’ve had to approach git flow, as if from a distance, in order to accommodate e.g. archives we’ve inherited from third parties. But today we committed to standardize on git flow across the team.

Git flow isn’t really a git extension; it’s more a methodology. Following it is optional: it’s a collection of conventions about naming and meant to help you avoid some of the pitfalls that can be found in any version control system. There’s command-line tools as well, but they’re really all about helping you enforce the conventions you’ve agreed to follow anyway. In an emergency or exceptional situation, you’re always free once again to do whatever’s required to sort things out.

The Tech Team next door have beat us to it on this - they’ve been using it for ages - but that’s great too, because it means that they’ve been able to recommend it, and so going forwards we hope to use it across the whole company.