Re: [Darwine] Website CVS Comitt

[Jim W. <ji...@pa...>]

Sanjay Connare wrote:

> $ cvs commit -m 'Added faq about running Windows games' faq.php
> cvs server: file `faq.php' had a conflict and has not been modified
> cvs [server aborted]: correct above errors first!

That means a conflict occurred during a merge (your file will contain 
one or more "<<<<<<" lines).  This should help explain the problem:

http://www.wincvs.org/winhtml/wincvs11.htm#_Toc453646192

Jim