Re: [PATCH REGRESSION] builtin/rebase: allow user to amend committed conflicts again

From: Jiang Xin <worldhello.net@gmail.com>
Date: Sep 27, 2026, 08:04 UTC
Message-ID: <CANYiYbF0yD-6CrhzZ3H83ZkynuMOdi1h5z20uLzwqNtQQG0ydA@mail.gmail.com>
In-Reply-To: <6ff9d1ac-ff06-439c-bb0a-ce57742e8ff9@kdbg.org>

On Thu, Sep 24, 2026 at 2:10 PM Johannes Sixt <j6t@kdbg.org> wrote:

Show 10 quoted lines

>
> [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.

Thanks for the heads-up. I noticed the revert commit upstream. I will rebase all l10n commits onto the new upstream branch to prevent the reverted commits from being reintroduced, and will try to restore the reverted l10n entries.

>
> -- Hannes
>