Re: CVS

[Ken T. <ke...@we...>]

On 28 May 2000, Jesper Skov wrote:

> Just regular cvs update. It will not cause local work to be
> lost. Worst case it will try to merge your work with stuff from the
> repository if the work affect the same lines of a file - but then it
> will notify you of a conflict (C) and leave both versions in the file
> marked by <<<<<<<<<<<< and >>>>>>>>>>>>>.

Hello,

'C' ?

Is this is one of the characters on the start of each line ?
 
> Still, it's a good idea to do occasional diffs (cvs diff -u) and keep
> them around (backups).

OK

ken.