• Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Campbell Ritchie
  • Jeanne Boyarsky
  • Ron McLeod
  • Paul Clapham
  • Liutauras Vilda
Sheriffs:
  • paul wheaton
  • Rob Spoor
  • Devaka Cooray
Saloon Keepers:
  • Stephan van Hulst
  • Tim Holloway
  • Carey Brown
  • Frits Walraven
  • Tim Moores
Bartenders:
  • Mikalai Zaikin

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

 
Ranch Hand
Posts: 495
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • 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!
 
Sheriff
Posts: 9707
43
Android Google Web Toolkit Hibernate IntelliJ IDE Spring Java
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • 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...
 
reply
    Bookmark Topic Watch Topic
  • New Topic