Question: Any opinion on branch per developer approach? This is the first time I have come across it someplace and feel that there's just no reason too. I've been through the branching guidance and even use your article in MSDN magazine from earlier this year as reference. The development teams are offshore...

As we begin planning the next release of the branching guidance, a top priority is to address how to manage shared code dependencies (the Dependency Repository / Shared Code issue). The newly release Build Customization Guide (now available for download from Codeplex) begins to address this issue, primarily...

Caution: Renaming branches in TFS 2010 is a very bad idea unless you follow a very specific set of steps: http://blogs.msdn.com/b/chandrur/archive/2010/06/09/renaming-branches-in-tfs-2010.aspx . In TFS 2010, Unshelve will follow pending renames but it will not follow renames committed between when the...

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...

When TFS does a merge, it bases the merge on prior merge history, not on the actual contents of the source and target files. There are many reasons why this is necessary, some of which will become apparent by reading this post. For example, a merge may result in a conflict (changes made to both the source...

Download the latest VS ALM Rangers Branching Guidance Here: http://tfsbranchingguideiii.codeplex.com/   Background – I keep getting this question: I have a quick question for you on branching in Scrum and feature management.  My client is using Scrum and if we look at the branching structure...

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...

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...

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...

After a few years hiatus, i am returning to the world of *published author*. My next article will be published in the February 2011 issue of MSDN Magazine ( http://msdn.microsoft.com/en-us/magazine/default.aspx ) The topic will be *Visual Studio ALM Rangers Branching Guidance for Team Foundation Server...

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 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...

One of my customers upgraded a Team Project from TFS 2008 to TFS 2010. As you probably know, the concept of first-class branches was introduced for the first time in TFS 2010. Along with this, there is a new restriction against having nested branches in TFS 2010. During the upgrade process, TFS attempts...

In October, the VS ALM Rangers posted the Branching Guidance - German version   thanks to Boris Wehrle , Thorsten Dralle , and Sven Hubert .

In October, the VS ALM Rangers posted the Branching Guidance - Spanish version   thanks to Francisco Fagas , a VS ALM MVP. Francisco also translated the Visual Studio 2010 Quick Reference Guidance – Spanish version ).