26.04.2015 Views

Team Development with Visual Studio Team Foundation Server

Team Development with Visual Studio Team Foundation Server

Team Development with Visual Studio Team Foundation Server

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

• For more information about merging, see “How to: Merge Files and Folders” at<br />

http://msdn2.microsoft.com/en-us/library/ms181428(VS.80).aspx<br />

• For additional descriptions of how to branch and merge in <strong>Visual</strong> <strong>Studio</strong> 2005, see<br />

“Branching and Merging <strong>Team</strong> <strong>Foundation</strong> Source Control” at<br />

http://msdn2.microsoft.com/en-us/library/ms181423(VS.80).aspx<br />

Plan Your Branching Structure Along Merge Paths<br />

You can only merge along existing branch paths by using Source Control Explorer. You<br />

can do baseless merges along other paths from the command line, but this type of merge<br />

is less intelligent, resulting in more merge conflicts and additional conflicts in future<br />

merges.<br />

Keep the following in mind when you perform merges:<br />

• Merging along the hierarchy, from parent to child or from child to parent, results in<br />

fewer conflicts than merging across the hierarchy.<br />

• The branch hierarchy is based on the branch parent and branch child, which may be<br />

different than the physical structure of the source code on disk. For example:<br />

• Physical Structure:<br />

o <strong>Development</strong> – <strong>Development</strong> branch<br />

o Main – Integration branch<br />

o Releases – Container for release branches<br />

• Release 1 – Release Branch<br />

• Logical Structure:<br />

o Main<br />

• <strong>Development</strong><br />

• Release 1<br />

Additional Resources<br />

• For an introduction to branching and merging, see “Branching and Merging Primer”<br />

at http://msdn2.microsoft.com/en-us/library/aa730834(VS.80).aspx<br />

• For more information about branching, see “How to: Branch Files and Folders” at<br />

http://msdn2.microsoft.com/en-us/library/ms181425(VS.80).aspx<br />

• For more information about merging, see “How to: Merge Files and Folders” at<br />

http://msdn2.microsoft.com/en-us/library/ms181428(VS.80).aspx<br />

• For additional descriptions of how to branch and merge in <strong>Visual</strong> <strong>Studio</strong> 2005, see<br />

“Branching and Merging <strong>Team</strong> <strong>Foundation</strong> Source Control” at<br />

http://msdn2.microsoft.com/en-us/library/ms181423(VS.80).aspx<br />

Branch at a High Level, Including Configuration and Source Files<br />

Branch at a high-enough level that the branch you create is still compilable. For instance,<br />

in the following source tree:<br />

• Main – container for all assets you need to ship the product<br />

• Source – container for everything you need to build<br />

o Code – container for source code

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!