Re: The git spring cleanup challenge

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 3, 2021, 03:00 UTC
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).

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.