Instead of choosing one version over the other, cvs has added both versions tothe ChangeLog file, and surrounded them with special separators to clearly mark the conflict in question.
Also, if you compiled the sources, you will probably see a lot of"?[path]" lines; these are object files that cvs notices are not from theremote repository.
By creating a.cvsrc file in your home directory, you can tell cvs to use preferred command-line options by default so that you don't have to remember to type them in each time.
v0.4 disapperd from its location due to my ex-boss and thid doc found it's new place at the proper url: . prior: I don't rememeber and I didn't use rcs nor cvs:(
However, cvs won't throw this file away, and will still keep a complete record of its contents and its history, just in case you need it back in the future.
Once CVSROOT is set, then this can be done with a single command: cvs initafter which you should see at least a directory named CVSROOT when listing the CVSROOT directory
