Re: merging .gitignore

From: Pierre Habouzit <madcoder@debian.org>
Date: Oct 3, 2007, 08:58 UTC
Message-ID: <20071003085845.GB12042@artemis.corp>
In-Reply-To: <20071003084259.GA25838@lapse.madduck.net>

On Wed, Oct 03, 2007 at 08:42:59AM +0000, martin f krafft wrote:

Show 12 quoted lines

> also sprach Pierre Habouzit <madcoder@debian.org> [2007.10.02.2307 +0100]:
> >      (a*)
> >     /    \
> >    v      v
> > (ab*)    (ac*)
> >     \    /
> >      v  v
> >      ????
> > 
> >   This is a perfectly sensible history. Or I miss sth on your end.
> 
> So these are revs, not branches?

  Yes, those are the contents of the .gitignores on refs, on top is the
common ancestor, and you have two branches that you want to merge into
one. I pretend that if in one branch the content of the .gitignore was
a* and becomes ab* and than on the other it was a* and became ac*, then
you cannot know how to merge.

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