From: Jeff King <peff@peff.net>
Date: Thu, 29 Feb 2024 00:44:46 GMT
Subject: Re: [PATCH 0/4] some v2 capability advertisement cleanups
Message-ID: <20240229004446.GA1654078@coredump.intra.peff.net>
In-Reply-To: <xmqq1q8wjgft.fsf@gitster.g>

On Wed, Feb 28, 2024 at 03:51:34PM -0800, Junio C Hamano wrote:

> Jeff King <peff@peff.net> writes:
> 
> > There are some small textual conflicts with the series I just posted in:
> >
> >   https://lore.kernel.org/git/20240228223700.GA1157826@coredump.intra.peff.net/
> >
> > I'm happy to prepare this on top of that if it's easier.
> 
> Thanks for a heads-up.
> 
> The other one merged first and then this one does give the
> following, which does not look like a huge deal.

Yep, that matches the resolution I did locally.

-Peff