From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 02 Jun 2021 11:00:25 GMT
Subject: Re: The git spring cleanup challenge
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.