Simon Willison’s Weblog

A successful Git branching model (via) This looks eminently sensible. The master branch is used for production-ready code, and is only updated by merging from either release branches or emergency hotfix branches. A develop branch is used for integration (from feature branches), and is branched to create release branches when a release is nearly ready. It’s all comprehensively documented and comes with some well-designed diagrams.

# 20th January 2010, 7:30 pm / git, branching, development, process

Subversion branching quick start. Ned Batchelder’s branching tutorial.

# 29th October 2006, 3:27 pm / subversion, ned-batchelder, branching

Subversion tips: working with branches. Django gets a mention for best practices.

# 13th February 2006, 3:20 pm / subversion, branching, django