Re: CVS

[Geert U. <ge...@li...>]

On Mon, 29 May 2000, Ken Tyler wrote:
> On 28 May 2000, Jesper Skov wrote:
> > 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 ?

Yes, `C' means conflict.

IIRC, there's a good tutorial on CVS at http://www.cyclic.com/.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds