Re: The git spring cleanup challenge

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 2, 2021, 11:00 UTC
Message-ID: <xmqqo8co7cqe.fsf@gitster.g>
In-Reply-To: <9fb1f823-44f8-8046-adb5-d2c0fdb6b5a0@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

> rerere.autoupdate erases the information which files had conflicts.
> ... So, I'm strongly opposed to enabling it by default.

Exactly. "checkout -m" can use resolve-undo information to unresolve the conflicts, but to make effective use of it, you'd want to know which paths had conflicts to begin with.

$ 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.