Project Dependencies will break with branching if not done properly

In the February 2011 issue of MSDN Magazine, I wrote an article on Shared Code (or code dependencies as some call it). Often I see a common problem with relative references to dependent assemblies or projects. If relative references are not created properly for a solution that is branched, the relative references may break. Since…

1

What is a Cherry Pick Merge, and why do you recommend against them?

When you merge in TFS 2010, you have two choices: Merge all changes up to a specified version, which can be one of the following: Latest Version Date Label Changeset Workspace Version Or, merge Selected Changesets, where you select one or more changesets from a list of changesets that are in the source branch and…

5

Branching–Sprint is Done, Some Features Are Not

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 all sprints branch off of main.  I noticed in your blog…


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…

5

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…

3

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

2

New article on Ranger’s Branching in upcoming MSDN Magazine.

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 (TFS) Team Projects*. My co-author is Willy-Peter Schaub, also on the…

1

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…