... complains.¹

Developers need to be aware that cvs update -A updates your area to the head of CVS, bringing in any changes that have been made to the head while you were working on the package. CVS prints a code telling you which files were modified (M) by you, which files need updating (U) in your area, and which files both need updating and there are conflicts (C) between your changes and others which CVS asks you to resolve. If there were conflicts CVS creates a backup of the file prefixed by #. If this is too intimidating for you, first do a cvs -n update -A which will merely print the informational code, and will not change a single file in your area.

.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.

...1²

If you are adding new files to a package, you should do a cvs update -A before doing a cvs add, or the files will be added to a branch off of the version checked out, not to the head. If you mistakenly added the files to a branch, you should cvs remove them, cvs commit the remove, and do a cvs update -A before adding them again. To do a cvs commit you will need privileges: contact your release manager.

.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.