Presentation Abstract:
In this session, we will discuss various strategies for branching and merging source code. Branching and merging is a feature of most source code control repositories that allows you to isolate one person's changes from another person's changes (or isolating one team's changes from another team's changes). If done right, the result is isolation during development, convergence of code changes on a regular rythm, and predictable results after a merge. If done wrong, it can be a disaster.
A common use for branching and merging is in dealing with production bug fixes. If you have strategic development going on for your "v.next" release, how do you deal with expediting bug fixes into production - without interfering with development or testing of your "v.next" release? Branching & merging - that's how you should deal with it.
We will talk about the reasons why you may need isolation for your coding changes (you may not realize how useful this technique can be). You will learn various techniques for branching - including "branch by feature", "branch by team", "branch by sprint" and "branch for prod fixes". For this presentation, we will use Microsoft Team Foundation Server 2008 as our platform.
About the Presenter:
Dan Caron is a published author of two technical books on DotNetNuke development. He has been a major contributor to the DotNetNuke open-source portal project since the core team was founded in 2003. As an original member of the Core Team in 2003, Dan was a Core Architect and member of the project's Board of Directors. He retired from DotNetNuke in 2006 and as a result, he now enjoys a lavish lifestyle of fortune and fame (just checking to see if anyone reads this). Based on his significant community contributions, Dan was recognized as a Microsoft Most Valuable Professional (MVP) in 2005 and 2006.
For 15 years, Dan has been leading the development of software applications with technologies that include Microsoft Silverlight, VB.NET, Team Foundation Server (TFS), C#, ASP.NET, XML/XSL, SQL and AJAX. Since 2001, Dan has been a Systems Consultant with MassMutual Financial Group, a Fortune 100 financial services organization. With MassMutual, he leads the technical direction for Microsoft .NET application development for the enterprise. Dan is also the leader of the Western Mass Microsoft Technology Users Group.
Sponsors
JetBrains has a passion for making developers more productive. We make development tools more intelligent, development processes more efficient, and development cycles shorter -- to simplify your challenging tasks, automate the easy ones, and help you /Develop with Pleasure/. Our innovative .NET products include: ReSharper, TeamCity and dotTrace.
Wrox Press, established in 1992 to publish books for computer programmers, is driven by the Programmer to Programmer philosophy. Wrox books are written by programmers for programmers, and the Wrox brand means authoritative solutions to real-world programming problems. Wrox's unique author-editorial process delivers the best and most useful information you need in the timeliest manner.
Meeting Location
MassMutual Learning & Conference Center
350 Memorial Drive
Chicopee, MA 01020
Telephone: (413) 598-9898
From the West
Take I-90 East (Massachusetts Turnpike) to Exit 5 (Chicopee). Bear Right after toll booth, and then Right again onto Rte. 33. The MassMutual Learning & Conference Center is one half mile on the Right.
From the East
Take I-90 West (Massachusetts Turnpike) to Exit 5 (Chicopee). Bear Right after toll booth, and then Right again onto Rte. 33. The MassMutual Learning & Conference Center is one half mile on the Right.
From the South
Take I-91 North
to Rte. 291 East in Springfield. Follow Rte. 291 East to Exit 6 Ludlow/Chicopee Falls). Follow exit ramp to first Stop sign. Take a Right onto Fuller Road. Continue on Fuller Road to third traffic light. Take a Left at light onto Memorial Drive (Rte. 33). Take a Right into MassMutual Learning & Conference Center entrance.
From the North
Take I-91 South to Exit 14 to I-90 (Massachusetts Turnpike). Take I-90 East to Exit 5 (Chicopee). Bear Right after toll booth, and then Right again onto Rte. 33. The MassMutual Learning & Conference Center is one half mile on the Right.
If you have questions, please direct them to:
Dan Caron
User Group Leader, Western Mass Microsoft Technology Users Group