To clarify and correct my last post, "cvs update" (no flags) merges your local changes with the current state of the repository and informs you of conflicts. "cvs update -C" saves your local modifications in the .# files while fetching fresh copies from the repository. This flag is useful for those times when you totally screw up your working copy ... i.e. "the planning phase".
