Synchronizing with the repository

To synchronize resources in the Workbench with those in the repository:

1. In the Navigator view, select the resources that you want to synchronize.
2. Right-click and select Team > Synchronize with Repository. The Synchronize view opens.
3. Use the toolbar buttons to switch modes for this view. There are three:
   • Incoming mode - shows incoming changes only (resources in the repository that differ from what is in the Workbench).
   • Outgoing mode - shows outgoing changes only (resources modified in the Workbench).
   • Incoming/Outgoing mode - shows both incoming and outgoing changes.

   Important: It is preferable to update resources in the Workbench first, resolve any conflicts that exist by merging, then commit Workbench resources to the repository.

4. It is possible that someone has committed a new revision of your file since you started working on it. This will result in a conflict, and care must be taken to resolve this. To see just conflicts, click the Show Only Conflicts button on the view's toolbar.

The resources displayed in the Structure Compare area will depend on which mode is used in the Synchronize view. In the Text Compare area, the Workbench resource is on the left side, and the repository resource is on the right side.

Team programming with CVS
Branches
Synchronizing with a CVS repository
Three-way comparisons

Committing
Updating
Resolving conflicts
Comparing resources
Merging changes in the Compare editor
Merging from a branch
Version control life cycle: adding and ignoring resources
Replacing resources in the Workbench

CVS
CVS Synchronize view