On Wed, Oct 03, 2007 at 08:42:59AM +0000, martin f krafft wrote: > also sprach Pierre Habouzit <madcoder@xxxxxxxxxx> [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@xxxxxxxxxx OOO http://www.madism.org
Attachment:
pgpdiFAWiRZ3W.pgp
Description: PGP signature
