Re: [PATCH REGRESSION] builtin/rebase: allow user to amend committed conflicts again
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Sep 24, 2026, 06:10 UTC
- Message-ID
- <6ff9d1ac-ff06-439c-bb0a-ce57742e8ff9@kdbg.org>
- In-Reply-To
- <CABPp-BENMwiHh=y_RtfY3Y+uyjRvbpPSTRE9sCGvOtpeeMgapw@mail.gmail.com>
[Cc: Jiang Xin]
Am 23.09.26 um 19:49 schrieb Elijah Newren:
> Yeah, reverting and retrying after the release probably makes sense > given how close we are to 2.56.
The reverted series (0f8e75abebff) re-introduced one translatable string ("You are in the middle of a rebase -- cannot amend."), which tranlators may have removed from *.po files by now.
-- Hannes