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

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

Additional Resources<br />

• For more information about resolving merge conflicts, see “Resolving Conflicts” on<br />

the MSDN Web site at http://msdn2.microsoft.com/enus/library/ms181432(VS.80).aspx<br />

Check In the Results of One Merge At a Time<br />

Check in the results of one merge before performing a second merge that involves the<br />

same files. After performing the first merge, compile the code and ensure that the unit<br />

tests succeed, and then check in your pending changes. Then begin the second merge and<br />

repeat the process.<br />

This helps to reduce complexity and, by keeping the merges separate, enables you to<br />

undo changes if the need arises.<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 />

Build and Run Tests After the Merge and Prior to Check-in<br />

Having performed a merge, make sure that you compile the code and run the associated<br />

tests before checking in the merged file. Do this to avoid introducing build instability as a<br />

result of your merges.<br />

The results of a merge are initially isolated <strong>with</strong>in your workspace and are not uploaded<br />

to the server until you check in the pending changes.<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 on 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 on 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

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

Saved successfully!

Ooh no, something went wrong!