VS ALM Rangers Branching Guidance – Ideas for the next release.

I think most would agree that the Rangers Team has already done a fantastic job with the Rangers Branching Guidance. This is not meant to be a self-serving comment, since the current branching guidance is the result of the hard work of many others in addition to myself. For the past couple of years I…

4

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 (http://tfsbranchingguideiii.codeplex.com ) “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…

1

My source and target files are different, but merge tells me there are no changes to merge

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…


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