Edit: just saw RT's post above... oh well, I'll keep this here for everyone else's CVS edification
Looks like a conflict -- the files you are committing have been changed by someone else. Here's how to fix it:
1.
Make sure you back up your working copies! You don't need to do the whole directory, just the ones w/ errors. Strictly speaking, you don't need to do this, but it's a good idea....
2. You will need to do an update. This will merge your changes with those on the server. You will probably see some lines like:
M filename1.xxx
C filename2.xxx
...The 'M' lines are OK, it means your local file was modified but the one on the server was not, and you should be able to check it in OK once you fix the other files.
The 'C' lines indicate a conflict. CVS has now merged your changes with those on the server, putting the merge on your machine.
3. Edit the conflict file; you will see the results of the merge, like this:
<<<<<<<< filename2.xxx
your changes are here
========
changes from the server are here
>>>>>>>> 1.5You will just need to go through and resolve the conflicts. Determine which of the change sets are more appropriate to keep, and edit the file, keeping the "good" stuff and blowing away the others. Also make sure you erase the '<<<<', '====', and '>>>>' markers.
4. Repeat for all files that had conflicts
5. Compile to make sure it works as expected.
6. You should now be able to do a commit.
