How to synchronize a work area

Use this procedure to compare the files in your work area to those in the database and resolve the differences.

This operation is useful if you've manually changed files in the file system without checking out the files or if a project update fails because of changes in the file system. By syncing the work area, you can select a conflict in the Work Area Conflicts dialog box, then compare the differences from the file in the file system with the file in the database.

The following operation discusses ways in which to resolve work area conflicts after a sync.

1.       Right-click over a modifiable project in the Navigator or Package Explorer view, select Sync under the Team submenu.

The Work Area Conflicts dialog box appears.

2.       Review the list of conflicts.

 

3.       Resolve conflicts.

You can resolve conflicts in the following ways: discard work area changes, keep work area changes, or ignore files you do not want to control.

Discard work area changes

Select this icon if you want to discard changes to specified files in your work area. Additionally, if you choose to discard a directory, the directory and all of its members will be discarded from your work area. In both cases, the file(s) and directory will be replaced in your work area with the latest database version.

Keep work area changes

Select this icon if you want to sync changes to a directory and file(s) in your work area with the database. Note that this can result in new files because a file in your work area, but not in the database will be added to the database.

Ignore files you do not want Synergy to control

If you see conflicts for files that you don't want to control, you can choose to ignore files by pattern through the Show work area filters action  in the Sync Work Area section under the Actions tab. Doing this sets filters to keep files with specified patterns from appearing as conflicts after you perform a Sync Work Area operation.

If you set filters, you will need to perform another sync to refresh the output in the Work Area Conflicts dialog box.