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.

Additional Resources<br />

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

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

What is the difference between the logical and physical view of branches?<br />

The physical view is the hierarchy that appears <strong>with</strong>in your source tree, as shown in the<br />

following example:<br />

• $/My<strong>Team</strong>Project<br />

o <strong>Development</strong><br />

• Source<br />

o Main<br />

• Source<br />

o Releases<br />

• Release1<br />

• Source<br />

• Release2<br />

• Source<br />

<strong>Development</strong>, Main, Release1, and Release2 are branches that directly contain source<br />

code. Releases is a folder that contains multiple branches.<br />

The logical view is the hierarchy of parent and child branches as they were created. This<br />

hierarchy is not shown in the source tree but can be visualized based on how each branch<br />

was created; for example:<br />

• Main<br />

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

• Release1<br />

• Release2<br />

The logical view is important because merging is easiest when you do it up and down,<br />

rather than across, the logical hierarchy. If you execute a merge across the hierarchy, you<br />

must perform a baseless merge, which requires use of the command line and significantly<br />

more conflict resolution.<br />

Additional Resources<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 />

• To learn how to merge files and folders, see “How to: Merge Files and Folders” at<br />

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

• To learn more about baseless merges, see the /baseless option in “Merge Command”<br />

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

If I use the code promotion model, how often should I merge?<br />

Merge frequency depends on your branch structure. For example, a common branch<br />

structure is as follows:

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

Saved successfully!

Ooh no, something went wrong!