From: Matthew Cengia Date: Wed, 20 Nov 2013 12:33:21 GMT Subject: Re: Bizarre git merge behaviour Message-ID: <20131120123320.GF26413@debian.cengia.id.au> In-Reply-To: <528CAB40.8030107@viscovery.net> On 2013-11-20 13:29, Johannes Sixt wrote: [...] > That's strange. I can't tell what is going on. Perhaps you have some > criss-cross merges in your history that merge-recursive trips over? That's as good a guess as any, but I suspect tracking it down may involve needles and haystacks... > > Sorry, I don't know how to help you further. No worries, thanks very much for your help so far nonetheless. -- Regards, Matthew Cengia