Team Development with Visual Studio Team Foundation Server

• A baseless merge is being conducted in which the branch file relationships are not
known to TFS.
The merge tool shows you the details for each conflict and allows you to choose which
change you want to keep in the final merged file. You can choose to keep the source
change, keep the destination change, integrate both changes, or manually modify the final
version by typing directly into the file.
After resolving every conflict in the file, save the final version as a pending change to be
checked into the target branch.
Be careful when merging because it is easy to make mistakes that might result in build
instability. After you have finished merging, compile the resulting source and run unit
tests to test for major breaks.
Additional Resources
• For more information about resolving conflicts, see “How to: Resolve Conflicts” at
http://msdn2.microsoft.com/en-us/library/ms181433(VS.80).aspx
How do I avoid conflicts?
Most conflicts can be automatically resolved by Team Foundation Version Control. The
scenarios in which you are most likely to need a manual merge―and therefore are worth
avoiding―are scenarios in which there are overlapping changes to the same lines of
code, or where more than two developers are working on a file at the same time.
To view pending changes
1. In Source Control Explorer, right-click the solution, project, folder, or file for which
you want to see pending changes.
2. Select View Pending Changes.
This method will show you all of the pending changes within the scope you have
selected.
If you use the command line checkout tool, it will indicate which other users have
checked out this file, including information about the nature of the users’ pending
changes. In the following example, a file named Math.cs is checked out, and TFS
provides a notification that two other users (James and Sally) are working on the file. The
notification indicates exactly what type of pending change each user has in his or her
local workspace (Edit and Rename) and confirms that the local version of the file (the
current workspace version) is not based on the latest repository version.
c:\dev\projects\calc\src>tf edit math.cs
ExplorerScc.cs