Whats the difference between “cvs checkout” and “cvs update”?
Doing a cvs checkout creates an initial local copy of the repository files. You only do this once when you first start working with this repository. Update examines the files in the repository and attempts to bring your local copy up to date. It does not change files in the repository. If changes have been made to repository files that you have not changed since your last update (or checkout) then these changes are made in your local copy. If both the local copy and the repository copy have changed, cvs tries to merge the changes. If the changes affect different parts of the file the merge happens automatically and you are informed. If the changes affect the same sections of the file then cvs warns you that it can’t do the merge automatically and your intervention is required to resolve the conflict.
