Zdieľať cez

Reconcile differences between two folders

  • Článok

TFS 2018

Visual Studio 2019 | Visual Studio 2022

After you compare a server folder and a local folder in Team Foundation Version Control (TFVC), 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 folders.

Prerequisites

To do these procedures, you must have the Read and Check out permissions set to Allow. For more information, see Default TFVC permissions.

Note

To reconcile two local folders or files, you don't need Azure DevOps permissions.

Reconcile differences

  1. In Visual Studio Source Control Explorer, right-click a folder, and then select Compare. The Compare dialog box opens.

  2. In the Compare dialog box, select the folder versions to compare, and then select OK. The Folder Difference window appears.

  3. In the Folder Difference window, right-click the folder or file you want to reconcile, and select Reconcile.

    Note

    You can select multiple folders and files by holding down the Ctrl key and selecting the items. Also, you can press Ctrl+A to select all folders and files.

    The Reconcile Folder Differences window appears.

  4. For Files that are not in your workspace, either select Get Latest Version to download the latest version of the files, or select Ignore to leave these files only on the server.

  5. For Files that are not on the server, either select Add to Server to upload the files to the server, or select Ignore to leave these files only in your local workspace.

  6. 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 Latest Version to download the latest version of these files to your local workspace.

  7. For Files that do not have pending changes, select one of the following options:

    • Get Latest Version to download the latest versions of files.
    • Check Out to check out the server version of files. If you made any changes to your local versions, you'll get an option to merge these changes with the server version when you check in the files.
    • Ignore to leave these files on the server.

  8. Select OK.

    If you have pending changes in your local workspace that conflict with the server version of a file, and you choose to Get Latest Version of the file, the Resolve Conflicts window appears. For more information, see Resolve Team Foundation Version Control conflicts.