From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 03 Jun 2021 03:00:25 GMT
Subject: Re: The git spring cleanup challenge
Message-ID: <xmqqmts764ae.fsf@gitster.g>
In-Reply-To: <87im2wtqg2.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

> I'm second here. Wanted to get rid of some recorded resolutions, but
> didn't find a suitable way to.

J6t gave a good summary on a side thread.  "rerere forget" followed
by "checkout -m" is your friend (alternatively you can redo the
operation that applied a "wrong" resolution after doing the "rerere
forget" step, of course).