Next: The pserver access method is not working, Previous: CVS says it is waiting for a lock; what does that mean?, Up: Some Real Life Problems (With Solutions)
Don't panic – it just means that the file has changed in the repository since the last time you checked it out or updated it.
Run cvs update on the file to merge in the changes from the
repository. If the received changes conflict with your local changes,
edit the file to resolve the conflict. Then try your commit again – it
will succeed, barring the possibility that someone committed yet another
revision while you were busy merging the last changes.