Re: [PATCH 00/12] Fix various overly aggressive protections in 2.45.1 and friends

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 21, 2024, 21:14 UTC
Message-ID: <937e89c6-6161-42ba-670d-8f20ff90a7d0@gmx.de>
In-Reply-To: <20240521195659.870714-1-gitster@pobox.com>

Hi Junio,

On Tue, 21 May 2024, Junio C Hamano wrote:

Show 5 quoted lines

> I'll figure out a way to convey conflict resolutions as this topic
> gets merged up to newer maintenance tracks on the list so that
> people can assist with ensuring correctness of the result by
> reviewing, and follow up. ("git show --remerge-diff" might turn out
> to be such a way, but I do not know yet).

I pushed 12/12 to https://github.com/dscho/git's `various-fixes-for-v2.45.1-and-friends` branch, and updated the `tentative/maint-*` branches accordingly:

 + b9a96c4e5dc...c6da96aa5f0 maint-2.39 -> tentative/maint-2.39 (forced update)
 + 4bf5d57da62...fff57b200d1 maint-2.40 -> tentative/maint-2.40 (forced update)
 + 5215e4e3687...616450032a0 maint-2.41 -> tentative/maint-2.41 (forced update)
 + 33efa2ad1a6...b1ea89bc2d6 maint-2.42 -> tentative/maint-2.42 (forced update)
 + 0aeca2f80b1...093c42a6c6b maint-2.43 -> tentative/maint-2.43 (forced update)
 + 9953011fcdd...3c7a7b923b3 maint-2.44 -> tentative/maint-2.44 (forced update)

Ciao, Johannes