From: Pierre Habouzit <madcoder@debian.org>
Date: Tue, 02 Oct 2007 22:07:49 GMT
Subject: Re: merging .gitignore
Message-ID: <20071002220749.GE19710@artemis.corp>
In-Reply-To: <20071002214919.GA21260@lapse.madduck.net>

On Tue, Oct 02, 2007 at 09:49:19PM +0000, martin f krafft wrote:
> also sprach Pierre Habouzit <madcoder@debian.org> [2007.10.02.2207 +0100]:
> > > >        (a*)
> > > >       /    \
> > > >   (ab*)    (ac*)
> > > >       \    /
> > > >        ????
> > > 
> > > (a*, ab*, ac*)
> > 
> >   Definitely not. a* -> ab* is making a?* unignored for any value of ?
> > except b. So adding a* is definitely invalid.
> 
> In left, ab* is still ignored, in right ac* is still ignored, and in
> the integration branch, they're all ignored. We don't merge up in
> this model...

  err maybe you didn't get my little picture

     (a*)
    /    \
   v      v
(ab*)    (ac*)
    \    /
     v  v
     ????

  This is a perfectly sensible history. Or I miss sth on your end.

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org