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

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…


Nested Branch Issue following upgrade from TFS 2008 to TFS 2010

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 to determine…


Why I caution against Cherry Picking (changeset-based merging)

  Recently I was asked a question: “If you discourage changeset-based (or cherry-picking) merging, then why does TFS support it?  To me it feels like TFS is not fully supporting it because the merge engine isn’t robust enough yet to support it, yet they know the feature is important.  To me it seems like an…

1

TFS Migration and Integration Solutions

Technorati Tags: TFS. VSTS,TFS Migration,TFS Integration From Matt Mitrik: Microsoft has launched a new page on MSDN to serve as the central hub for all things related to conversion to and integration with TFS.  This new Migration and Integration Solutions page consolidates all of the offerings in this space, including the tools provided by Microsoft,…