Subject: Re: <<<<<<< Makefile
To: Jeremy C. Reed <email@example.com>
From: Hubert Feyrer <firstname.lastname@example.org>
Date: 10/15/2000 03:32:37
On Sat, 14 Oct 2000, Jeremy C. Reed wrote:
> Thanks for the explanation. Yes -- I did have a changed Mozilla package
> (trying M18 but went back) and a modified Packages.txt. I guess that the
> 'cvs update -d -P' was smart to not destroy my changes.
Well, it was. What you've faced (when you've paid close attention :-) was
that "cvs update" printed a "C" at the start of the line (where it
otherwise prints "P" etc.). This is a "C"onflict, indicating that someone
made a change to the same textual region as you've made a change, and that
some manual resolving is needed. The both areas of changes are indicated
by the <<<<< and >>>>> (and seperated by ====) lines.
If that happens, you should have a look at what changes conflicted, and
Hubert Feyrer <email@example.com>