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. A textual conflict is a region of overlapping text: different characters written into exactly the same space. A logical conflict is a programmatic event, when incompatible or problematic programming elements are used in the same program. CVS is not designed to handle logical evaluations of programs, only physical assessments of files.
Update before trying to reconcile merge conflicts. Updating a file with conflicts gives JBuilder the chance to flag the conflicts and sets the features that make resolving merge conflicts much easier.
To learn how to reconcile merge conflicts, see the "CVS Update (Merge) File" topic in "Team development using JBuilder."
There are two ways to update and merge a file that's under CVS version control:
This will affect the file that is active in the content pane.
This will affect the file you right-clicked on in the project pane.
You can use this to perform updates on several files at once:
In either case, the CVS Update dialog displays. It tells you what file or files it will update and merge.
Click OK or press Enter to approve the update. Click Cancel if you decide not to update at all. If you want to update some but not all of the files you chose, click Cancel, select the files you want, and use the right-click menu again.
The CVS Update dialog box will tell you when the merge has been successful. If there were any textual conflicts, the dialog box will notify you that there were merge conflicts. You must resolve the conflicts in a file before that file will be updated. If one file of several has conflicts, all the files will be updated but the one with the conflicts will be flagged.