Re: merging .gitignore

From: martin f krafft <madduck@debian.org>
Date: Oct 2, 2007, 21:49 UTC
Message-ID: <20071002214919.GA21260@lapse.madduck.net>
In-Reply-To: <20071002210748.GC19710@artemis.corp>

also sprach Pierre Habouzit <madcoder@debian.org> [2007.10.02.2207 +0100]:

Show 10 quoted lines

> > >        (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...

-- 
 .''`.   martin f. krafft <madduck@debian.org>
: :'  :  proud Debian developer, author, administrator, and user
`. `'`   http://people.debian.org/~madduck - http://debiansystem.info
  `-  Debian - when you have better things to do than fixing systems
 
"if there's anything more important than my ego,
 i want it caught and shot now."
                                                -- zaphod beeblebrox