There’s a nice introductory piece on using CVS with jDeveloper on OTN: Getting started with CVS. As i mentioned, it’s mostly related to using CVS in jDeveloper, but it shortly mentions some other CVS tools. The section on merging files is a bit disapointing, it doesn’t discus a lot of the CVS problems jdeveloper users are having: conflicts in non editable files, e.g., in the project description files. Quite often the easiest solution to these conflicts is to do a clean update, i.e., getting rid of your local changes and starting fresh from the latest repository version. This is however not always doable. jDeveloper 10.1.3 has a new format for the project description files, which should cause a lot less problems.