From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Dec 2018 07:28:40 GMT
Subject: Re: [PATCH 0/8] introduce no-overlay and cached mode in git checkout
Message-ID: <xmqqk1kfjj9z.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20181211225241.GW4883@hank.intra.tgummerer.com>

Thomas Gummerer <t.gummerer@gmail.com> writes:

> I think I got the right solution for that in patch 5, with deleting
> the file if it's deleted in "their" version and we pass --theirs to
> 'git checkout', and analogous for --ours.  I was just wondering if
> there were any further edge cases that I can't think of right no.

That sounds quite sensible.