[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Off-topic: my brain [Was Re: [Bug-gnubg] Bug: Compile error on suse
Re: Off-topic: my brain [Was Re: [Bug-gnubg] Bug: Compile error on suse (sgfp.h)]
Fri, 27 Jun 2003 18:36:39 +0200
On Fri 27 Jun 2003 (10:44 +0000), Joern Thyssen wrote:
> On Fri, Jun 27, 2003 at 11:29:47AM +0200, Achim wrote
> > Am Fre, 2003-06-27 um 10.45 schrieb Joern Thyssen:
> > > On Fri, Jun 27, 2003 at 10:38:57AM +0200, Achim Mueller wrote
> > > > Here is another one (with different output):
> > > >
> > >
> > > cvs status sgfp.h?
> > >
> > > I'm guessing you have a merge conflict.
> > Bingo! On both systems. After deleting sgfp.h and doing another cvs it
> > finally worked.
> > You make me shiver. Are you sure you don't have silicon and some other
> > electronical stuff rather than a human brain in your head? ;-)
> No, but once in a while my own neural net is actually learning something
> -- I've seen similar errors like yours before :-)
The '<<' and '>>' become depressingly familiar to people who use CVS
on multi-developer projects - it immediatlely suggests merge
Jim Segrave address@hidden