CVS Update Project dialog box

This updates all the files in the active project. Updating files retrieves changes from the repository and applies them to the files in your workspace.

When CVS updates, it automatically performs a merge, that is, it combines repository changes with your workspace changes. This synchronizes your workspace with the repository. All changes are preserved. If there are textual conflicts, they are flagged to be reconciled by the user.

Note that CVS only recognizes textual conflicts, not logical ones. Changes made to the same area of text in the file conflict in CVS: changes that only flaw logic do not.

To learn how to reconcile merge conflicts, see the "CVS Update (Merge) File" topic in "Team development using JBuilder."