[Asterisk-Users] *** Asterisk sunday news: Read the sample configs, Luke!

[Steven Critchfield]

On Sun, 2004-05-09 at 07:41, Mark Elkins wrote:
> On Sun, 2004-05-09 at 14:33, Mark Elkins wrote:
> > On Sun, 2004-05-09 at 09:59, Olle E. Johansson wrote:
> > > * Read the config sample files! (even if you're an Asterisk guru)
> > > -----------------------------------------------------------------
> > > For those of you that have a working installation that you keep using, this is a
> > > reminder to check into the configs/ directory of the Asterisk source tree, regardless
> > > if you downloaded a tar ball or from CVS.
> > 
> > Good advice - so I do a CVS UPDATE... and 'say.c' is broken....
> ...
> > The lines that begin with "<<<<<<<<<<< say.c"
> 
> Sorry folks... seems like a CVS Update did break - removed the file and
> re-updated..... fine now.
> 
> However - this could bit other people too.. in which case - delete the
> offending file - and update again (or always use 'cvs checkout' - less
> efficient - but..)

There should have been a warning from CVS about not being able to merge
the changes to that files. Then you would have been warned, and you
might have learned then that the sections that had been marked by the
'<<<<<<<<' would have shown you where you needed to reconsile the
changes to say.c. 
-- 
Steven Critchfield <critch at basesys.com>