Team Development with Visual Studio Team Foundation Server

o Shared Code – container for source code that is shared from other projects
o Unit Tests – container for unit tests
o Lib – container for binary dependencies
• Docs – container for documentation that will ship with the product
• Installer – container for installer source code and binaries
• Tests – container for test team test cases
Branch at the level of the Source folder to ensure that the new branch contains all source
and configuration files.
Additional Resources
• For an introduction to branching and merging, see “Branching and Merging Primer”
at http://msdn2.microsoft.com/en-us/library/aa730834(VS.80).aspx
• For more information about branching, see “How to: Branch Files and Folders” at
http://msdn2.microsoft.com/en-us/library/ms181425(VS.80).aspx
• For more information about merging, see “How to: Merge Files and Folders” at
http://msdn2.microsoft.com/en-us/library/ms181428(VS.80).aspx
• For additional descriptions of how to branch and merge in Visual Studio 2005, see
“Branching and Merging Team Foundation Source Control” at
http://msdn2.microsoft.com/en-us/library/ms181423(VS.80).aspx
Do Not Branch Too Deeply
Do not branch too deeply because this will add to the time required to merge a change
from a child branch up to the topmost parent. For example, in the following branching
structure:
• Development – Container for development branches
o Development Branch
• Sub-Branch
• Sub-Sub-Branch
• Main – Integration Branch
o Source
o Other Asset Folders
Merges result in fewer conflicts when performed along the branch hierarchy. Therefore,
if there is a change in the Sub-Sub-Branch that you would like to merge into Main, you
would first need to merge with the Sub-Branch and the Development Branch before
you can merge into Main. Each merge takes time to complete, resolve conflicts, build,
and test, which multiplies merge time by the level of branches you have created in your
branch structure.
Additional Resources
• For an introduction to branching and merging, see “Branching and Merging Primer”
at http://msdn2.microsoft.com/en-us/library/aa730834(VS.80).aspx