Isolating and Integrating Parallel Feature Teams working on Separate Overlapping Releases

Customer scenario: How should I isolate (and integrate) changes when working with: 3 parallel efforts (two parallel development efforts, working on separate releases of the product and production support) Production(version 2.0) with the need to issue hotfixes on then current production version Development Team 1, working on the next minor (Feature) release (version 2.1). New…


How do I create bug fixes for EVERY version of a product EVER released

A customer asks the following question: “We are building factory machine. New machines are usually delivered with the current stable software version. We don’t do regular updates because our customers prefer stability over new features. After reading the Rangers Branching Guide I have some questions. I understand the need for the main and the development…


Where do I fix a production defect?

Question from a customer of the Rangers Branching Guidance ( ) “My company has a major release every 3 months.  In between major releases we have monthly maintenance releases. (Similar to the "Advanced Branching Plan") Our monthly release usually is limited to high priority bugs based on customer complaints and business needs. Scenario: Lets say…


Branching for Scrum

This article presents a perspective on Source Control Management (SCM) using Team Foundation Server (TFS) with Scrum projects. Although I start with a short overview of Scrum to lay the foundation for the concepts, the essence of this article is to present TFS Branching Concepts for Scrum projects, large and small. This article is an…


Parallel Feature Teams working on multiple releases in development. Monthly releases to production.

I recently received a question from a customer who is dealing with the need to support multiple feature teams working on multiple releases in development. They asked how to structure branching to support this environment. Background: My company is, for all practical purposes, a dot com. We have a single production website used by all…


Branching for Agile Development

I was recently asked a question based on the following presentation from Google: How Google Speeds Up The Chrome Release Cycle (Slideshow) The main part of the article that interests me is the following: "Anthony LaForge, the technical program manager at Google overseeing Chrome development, created this presentation to explain how Chrome’s development cycles work….


Basic Branch Plan–Where to fix a bug in my release?

Question from Customer: In the single team branch, once a release is done and if a bug is reported are we supposed to fix the bug in the Main branch and forward integrate back to the DEV branch Response: Separating Development from Release, bug fixing a shipped release is a Release question, not a question…


Question on the Basic Branching Model

Question from customer: “I am very new to this branching  concept and try to understand.  I am not able understand the difference between the Single release vs. single team branching. Can someone help in knowing the difference.” Response: I like to think of branching for development separately from branching for release. The Main branch is…