http://blogs.msdn.com/b/billheys/archive/2011/01/18/branching-for-scrum.aspxThis 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 presenten-USTelligent Evolution Platform Developer Build (Build: 5.6.50428.7875)http://blogs.msdn.com/b/billheys/archive/2011/01/18/branching-for-scrum.aspx#10346199Tue, 04 Sep 2012 15:04:43 GMT91d46819-8472-40ad-a661-2c78acb4018c:10346199Paul Rogers<p>Is this content available in PowerPoint like the other diagrams where I can modify the images for our own sprint plan?</p> <div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=10346199" width="1" height="1">http://blogs.msdn.com/b/billheys/archive/2011/01/18/branching-for-scrum.aspx#10155126Mon, 18 Apr 2011 11:55:41 GMT91d46819-8472-40ad-a661-2c78acb4018c:10155126Mike Abad<p>Are these images available in powerpoint format like the branching guidance?</p> <div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=10155126" width="1" height="1">http://blogs.msdn.com/b/billheys/archive/2011/01/18/branching-for-scrum.aspx#10117569Wed, 19 Jan 2011 12:04:58 GMT91d46819-8472-40ad-a661-2c78acb4018c:10117569Bill Heys<p>Testing with a shared QA team is really a deployment issue for me rather than a branching issue. I do not recommend creating separate branches per test environment. Rather I recommend deploying from a development branch (or the Main branch) to the QA department. If you look at the branching structure, the branches furthest from main are more and more focused on features, while the branches closest to main are focused on integration. You can build and deploy the code from a feature branch for QA testing or you can build and deploy code from the Main branch for testing (QA stabilization prior to release, for example).</p> <p>If you look at my illustration above, the development branches for the Scrum teams are created prior to (or at the beginning of) the first Sprint. It doesn&#39;t matter in my mind when you create them as long as they exist prior to when the first Sprint begins development. You will also note that the same development branch(es) are used throughout the entire Scrum project. Some advocate creating a new set of development branch(es) for the Scrum Team(s) for each Sprint. I prefer having tha same set of branches (with merges from Main prior to each Sprint. This allows a more complete and less fragemented view of change history on the branch over time.</p> <div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=10117569" width="1" height="1">http://blogs.msdn.com/b/billheys/archive/2011/01/18/branching-for-scrum.aspx#10117382Wed, 19 Jan 2011 00:47:19 GMT91d46819-8472-40ad-a661-2c78acb4018c:10117382allen feinberg<p>Nice article</p> <p>2 Questions : </p> <p>What about shared testing with a single qa team across 2 scrum teams, would this require an additional integration branch between team branches and main?</p> <p>When do you create the sprint branch, during the sprint (say day 1) or do you create the sprint branch before the sprint starts (say 1 week before the sprint starts)?</p> <div style="clear:both;"></div><img src="http://blogs.msdn.com/aggbug.aspx?PostID=10117382" width="1" height="1">