Re: strange cvs conflicts

Date view Thread view Subject view Author view

From: Archie Cobbs (archie@whistle.com)
Date: Mon Jan 11 1999 - 17:23:35 EST


Alexandre Oliva writes:
> Agreed. I just need a confirmation that these conflicts were in the
> stamp-h[12].in files. We've just fixed this problem in automake (I
> had introduced it yesterday, with a `brilliant' idea I had, that ended
> up introducing noise and big potential for conflicts in the stamp
> files).
>
> It should be fixed in my next commit. I'll also prepare a new
> snapshot of automake, just in case.

It hasn't seemed to happen again, so hopefully it's fixed now.

-Archie

___________________________________________________________________________
Archie Cobbs * Whistle Communications, Inc. * http://www.whistle.com


Date view Thread view Subject view Author view

This archive was generated by hypermail 2b29 : Sat Sep 23 2000 - 19:57:38 EDT