Re: Regarding howto/revert-a-faulty-merge.txt - another way to revert a merge

From: Noam Yorav-Raphael <noamraph@gmail.com>
Date: Jun 26, 2024, 12:17 UTC
Message-ID: <CAO8o=D5T8geKY98ep6YX+Pa-HVLNXtWznEFxEjTkW3Z+JCxJ_w@mail.gmail.com>
In-Reply-To: <xmqqo77p8kct.fsf@gitster.g>

On Tue, Jun 25, 2024 at 12:03 PM Junio C Hamano <gitster@pobox.com> wrote:

>
> These, we definitely do not want them [*].
>  * We do not want the squashed CBA!!! revert or ABC reapply, both of
>    which are large balls of wax that interferes with bisectability.

Show 6 quoted lines

> So if you want to avoid "we can forget that we have reverted"
> problem, not reverting the revert, but rebuilding the entire chain,
> is a better approach that gives you cleanest history to work with,
> and that is what we already offer as an alternative of "reverting a
> revert", not "squashed revert and squashed reapply on the side
> branch".

If you don't mind rebasing the branch, what you're suggesting is fine. However, if it's a long-running branch, with multiple people working on it, rebasing is not an option. In that case, I think that my suggestion makes a lot of sense. A good idea would be to add the "large balls of wax" commits to a `.git-blame-ignore-revs` (or whatever you choose to call it) file.

Cheers, Noam