Team Development with Visual Studio Team Foundation Server

Example
Tf merge /baseless c:\data\proj1 c:\data proj2 /recursive
If you need to merge specific versions of the code changes, you can use the version
switch with Tf.exe as follows:
tf merge /baseless / recursive /version:~
Example
tf merge /baseless c:\data\proj1 c:\data\proj2 /recursive /version:C123~C125
Step 3 – Resolve Merge Conflicts
In this step, you resolve conflicts that might occur when performing a baseless merge.
After you run the Tf.exe command, it displays a Resolve Conflicts dialog box with a list
of the files that have conflicts.
1. Select each file and click Resolve.
2. In the Resolve version conflict dialog box:
• If there are no content changes, select the Keep changes in the target branch
resolution option and then click OK.
• If there are content changes, select the Merge changes in merge tool resolution
option, and then click OK.
3. In the merge tool, click the conflict regions in the upper pane or type in the lower
pane to apply changes for each conflicting line.
4. After you have applied changes for all of the conflicts, click OK in the merge tool.
5. After all the conflicts have been resolved, click Close.
Step 4 – Check-in the Merged Changes
In this step, you check-in the baseless merged changes
1. Open Source Code Explorer.
2. Right-click the target folder in which you have merged the changes and click Checkin
pending changes.
3. In the Check-In Source Files dialog box, ensure that all the files to be checked in are
selected.
4. Click Check In.
Additional Resources
• To learn how to merge files and folders, see “How to: Merge Files and Folders” at
http://msdn2.microsoft.com/en-us/library/ms181428(VS.80).aspx
• To learn more about baseless merge, see the /baseless option in “Merge Command” at
http://msdn2.microsoft.com/en-us/library/bd6dxhfy(VS.80).aspx