Re: [PATCH v5] sequencer: beautify subject of reverts of reverts

From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Date: Sep 11, 2023, 20:12 UTC
Message-ID: <568b853a-cf71-4262-86be-7b65cf066d93@app.fastmail.com>
In-Reply-To: <20230902072035.652549-1-oswald.buddenhagen@gmx.de>

On Sat, Sep 2, 2023, at 09:20, Oswald Buddenhagen wrote:

> Instead of generating a silly-looking `Revert "Revert "foo""`, make it
> a more humane `Reapply "foo"`.

Congrats on a nice series. It's very “lean and mean”—focused, not excessive.

And I think I will remember the phrase “too nerdy” for a while. ;)

Maybe we will get this message template the next time we revert a merge.[1]

Show 8 quoted lines

> If you merge the updated side branch (with D at its tip), none of the
> changes made in A or B will be in the result, because they were reverted
> by W.  That is what Alan saw.
>
> [...]
>
> In such a situation, you would want to first revert the previous revert,
> which would make the history look like this: ...

🔗 1: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt

Cheers

-- 
Kristoffer