> In text mode following commit -m > cvs server: file `bibletime.kdevprj' had a conflict and has not been > modified KDevelop modifies this file quite often. If you are sure you didn't add/remove files or changed important compiler settings, then just do $ rm bibletime.kdevprj $ cvs update while KDevelop is closed. You will get a fresh one, conflict free and can then commit.