This project has moved. For the latest updates, please go here.

Feature team branching

Apr 29, 2010 at 10:55 AM
Edited Apr 29, 2010 at 11:00 AM

Hello there,

I have been reading the TFS branching guidance before implimenting the branching strategy for my company. Before starting though, I have a question regarding what the feature team branches should contain.

If I have a MAIN branch that I have created that contains the following structure:

$GavsProject\MAIN\Source\WebParts
                                        \Business_Logic
                                        \WebServices
                                        \Database_scripts
                                        \Documentation

If I then try to create my feature team branches under a DEV folder (a peer folder of MAIN), should the strucute look something like the following?:

$GavsProject\DEV\FeatureBranch1\Source\WebParts
                                                             \Business_Logic
                                                             \WebServices
                                                             \Database_scripts
                                                             \Documentation

i.e. Should the feature branch contain an entire 'slice' of the main branch?
If I then had another team working on a second feature branch, should the second branch structure look like?:

$GavsProject\DEV\FeatureBranch2\Source\WebParts
                                                             \Business_Logic
                                                             \WebServices
                                                             \Database_scripts
                                                             \Documentation

Hope this makes sense and the editor doesent make too much of a mess of my hand cranked formatting.

Cheers,

Gav

Developer
Apr 29, 2010 at 1:53 PM

Gav,

In short, I believe the answer is yes.

Your main branch is MAIN. DEV is a folder and contains FeatureBranch1 and FeatureBranch2. These two feature branches should be full children of MAIN. As such, they will replicate the underlying folders of the MAIN branch, as your example depicts.

Regards,
Bill Heys
VS ALM Ranger