Team Development with Visual Studio Team Foundation Server

• 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
When Renames Are Part of the Merge, Pay Close Attention to the Path
That the Tool Recommends
When renames are part of the merge, pay close attention to the path that the tool
recommends and make changes as appropriate. All renames are marked as conflicts. The
merge algorithm used by TFS tries to calculate the best target path when a rename is
being merged over. In some cases the default target path is not the desired path, so you
should always double-check prior to committing the merged file.
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
Be Careful When Resolving Merge Conflicts
Be careful when merging because it is easy to make mistakes that may result in build
instability. When merging files:
• Double-check the code you are merging before committing the merges.
• Test that you can compile the resulting merged file before checking it back into
source control.
• Verify that the associated unit tests run and succeed before checking the merged file
back into source control.
• Make sure that you understand the nature of the changes made by another developer.
If you are in doubt about merging some lines, talk to the developer who made the
other changes so that you are sure of their purpose and to get a second view on the
impact of your merge.
After you have finished merging, compile the resulting source and run unit tests to test
for major breaks.