wood burning stoves 2.0*
The moose likes IDEs, Version Control and other tools and the fly likes CVS Error .classpath had a conflict and has not been modified Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login


Win a copy of OCA/OCP Java SE 7 Programmer I & II Study Guide this week in the OCPJP forum!
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "CVS Error .classpath had a conflict and has not been modified" Watch "CVS Error .classpath had a conflict and has not been modified" New topic
Author

CVS Error .classpath had a conflict and has not been modified

Abiodun Adisa
Ranch Hand

Joined: Jan 17, 2002
Posts: 495
I am having this error while trying to check in, I don't really know how to resolve this

The server reported an error while performing the "cvs commit" command.
brefftjobs: cvs commit: file `.classpath' had a conflict and has not been modified
brefftjobs: cvs [commit aborted]: correct above errors first!
Ankit Garg
Sheriff

Joined: Aug 03, 2008
Posts: 9307
    
  17

Look I'm not a pro at CVS but it seems that last time you ran a merge or some other command, there was a conflict in .classpath named file. And you didn't resolve that problem that's why it is not allowing you to commit the file. Which CVS software are you using to commit, command line or some GUI. I use tortoise CVS and it is a great tool. Netbeans also has a cvs tool integrated in it and that also works good...


SCJP 6 | SCWCD 5 | Javaranch SCJP FAQ | SCWCD Links
 
I agree. Here's the link: http://aspose.com/file-tools
 
subject: CVS Error .classpath had a conflict and has not been modified