From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Mar 2018 22:52:38 GMT
Subject: Re: Opinions on changing add/add conflict resolution?
Message-ID: <xmqq7eqf1tc9.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BGXdBJSi5EUyeom0PcgRXvwNy4EBA71MP3FZK9xsw-jdA@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> However, my question here about what to write to the working tree for
> a rename/rename(2to1) conflict in one particular corner case still
> remains.

Hmph, is it a bad idea to model this after what recursive merge
strategy does?  I think what is written out from that codepath to
the working tree has the nested conflict markers (with a bit of
tweak to the marker length, IIRC) in it.