This error comes because of Versioning problem between your local and CVS repository. To solve this ,,
- Take backup of your file .
- Replace your file from cvs .(Right Click --> Replace With --> Latest from Head). It will force your file to replace with the cvs version.
- Merge your changes with any other tools like WinMerge.
- Commit your changes now