Re: [PATCH v10 00/10] Fix scissors bug during conflict

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Apr 18, 2019, 09:14 UTC
Message-ID: <c37e44d1-d088-2088-148e-fb1ee022ac41@gmail.com>
In-Reply-To: <xmqqk1frhovr.fsf@gitster-ct.c.googlers.com>

On 18/04/2019 06:19, Junio C Hamano wrote:

Show 6 quoted lines

> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> With Denton's blessing I've rebased his patches on top of my patch to
>> fix the message cleanup with cherry-pick --signoff and -x [1]. I've

Note that the base is a merge of that patch (which is based on maint) with 041f5ea1cf ("The third batch", 2019-03-20)

Show 5 quoted lines

>> [1] https://public-inbox.org/git/20190329110842.30604-1-phillip.wood123@gmail.com/
> 
> Hmph, I certainly saw that patch, but I do not recall seeing any
> in-depth review of it.  How ready is it?  Was it because it was
> trivially obvious that we didn't see much activity on the patch?

I think it is ready (it's a fairly simple change). Dscho said he was happy with it [1].

[1] https://public-inbox.org/git/nycvar.QRO.7.76.6.1903291651340.41@tvgsbejvaqbjf.bet/

Best Wishes

Phillip