Thread (4 messages) 4 messages, 3 authors, 2023-09-11

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

From: Kristoffer Haugsbakk <hidden>
Date: 2023-09-11 21:38:42

Possibly related (same subject, not in this thread)

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]
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help