This week's book giveaway is in the Kotlin forum.
We're giving away four copies of Kotlin in Action and have Dmitry Jemerov & Svetlana Isakova on-line!
See this thread for details.
Win a copy of Kotlin in Action this week in the Kotlin forum!
  • Post Reply Bookmark Topic Watch Topic
  • New Topic

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

 
Abiodun Adisa
Ranch Hand
Posts: 495
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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
Posts: 9610
37
Android Google Web Toolkit Hibernate IntelliJ IDE Java Spring
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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...
 
It is sorta covered in the JavaRanch Style Guide.
  • Post Reply Bookmark Topic Watch Topic
  • New Topic
Boost this thread!