From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Mar 2018 22:26:56 GMT
Subject: Re: Opinions on changing add/add conflict resolution?
Message-ID: <xmqqbmfr1uj3.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BF-LnGPx6vKzCNaFNi_fkxK-CpenatOVa2fvJRZHd0hZw@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> Cool, thanks for the context.  I'm happy to go down this path, but
> there is one question I'd like your opinion on: what if the
> intermediate content merges have conflicts themselves?  If that
> question isn't clear, let me be more precise...

I think you answered this yourself after (re)discovering the virtual
ancestor merge in the recursive strategy, and no longer need my
input here ;-)