Reconcile Differences Between Two Folders
After you compare a server folder and a local folder, you can reconcile the differences between the folder contents and between files that have conflicting pending changes in your local folder. For more information, see Compare Two Folders.
To perform these procedures, you must have the Read and Check out permissions set to Allow. For more information, see Team Foundation Server Permissions.
To reconcile two local folders or files, you do not need Team Foundation Server permissions.
To reconcile differences
In Source Control Explorer, right-click a folder, and then click Compare.
The Compare dialog box appears.
In the Compare dialog box. select the folder versions to compare. For more information see Compare Two Folders.
The Folder Difference window appears.
In the Folder Difference window, right-click the folder or file you want to reconcile, and click Reconcile.
You can select multiple folders and files by holding down the CTRL key and clicking additional folders or files. Also, you can press CTRL+A to select all folders and files.
The Reconcile Folder Differences window appears.
For Files that are not in your workspace, either click Get to download the latest version of files that you do not have in your local workspace, or click Ignore to leave these files only on the server.
For Files that are not on the server, either click Add to Server to upload files that do not appear on the server or click Ignore to leave these files only in your local workspace.
For Files that have pending changes, select one of the following options:
Ignore to keep the changes made to these files in your local workspace.
Undo Pending Changes to disregard changes made to these files in your local workspace.
Get to download the latest version of these files to your local workspace.
For Files that do not have pending changes, select one of the following options:
Click Get to download the latest version of files that you do not have in your local workspace.
Click Check Out to check out the server version of files. If you have made any changes to your local version, you will have an option to merge these changes with the server version when you check in the files.
Click Ignore to leave these files only on the server.
If you have pending changes in your local workspace that conflict with the server version of a file and you chose to Get the latest version of the file, the Resolve Conflicts window appears. For more information, see Resolve Conflicts between Two Files.