[cvsnt] "C <filename>" vs "warning: conflict"

Arthur Barrett arthur.barrett at march-hare.com
Fri Feb 8 22:52:41 GMT 2008

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


>> From memory there are three cases for 'C' conflict:
>> 1) when the file can be merged
> If the file can be merged, the 'C' does IMHO not appear.

I know English good - I learnt from book.  I meant:

1) the file is a mergeable file but there was a conflict generated during 
the merge.



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook