On Monday, 02 April 2007, at 18:26:00 (+0200), Charles de Noyelle wrote: > I have the same problem OFTEN (maybe the fiveth time in 3 months). > "just" deleting e17_cvs/ (made by easy_e17.sh in ~) solves the > problem... But still dirty.
That puts a lot of undue strain on our CVS server(s) for no good reason. If you have one or more files that show up with conflicts (that's what the 'C' at the beginning of the line means), and you know you haven't directly/intentionally modified those files, remove JUST THOSE FILES and redo the update. Ignorance is bliss, but knowledge is power. Personal preference, I guess. Michael -- Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <[EMAIL PROTECTED]> n + 1, Inc., http://www.nplus1.net/ Author, Eterm (www.eterm.org) ----------------------------------------------------------------------- "The notion that something as complex and thermodynamically improbable as life could form out of a bit of ooze is about as believable as a jet airliner being assembled during a hurricane in a junkyard." -- Fred Hoyle (quoted by Sonia Shah) ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-users
