Re: The git spring cleanup challenge

From: Johannes Sixt <j6t@kdbg.org>
Date: Jun 2, 2021, 18:13 UTC
Message-ID: <f2b0c200-ff4f-da5e-ff49-c440ff0813de@kdbg.org>
In-Reply-To: <YLdvJ0G19LNcbDSD@danh.dev>

Am 02.06.21 um 13:44 schrieb Đoàn Trần Công Danh:

Show 14 quoted lines

> On 2021-06-02 20:00:25+0900, Junio C Hamano <gitster@pobox.com> wrote:
>> 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.
> 
> I don't know about this one. I had been bitten by rerere.autoupdate
> sometimes. And I need to wipe out the rerere record to start over.
> 
> I guess I should turn it off, then.

You can use

   git rerere forget that/file

to erase the record for the current resolution of that/file. Then you can recreate the conflict using

   git checkout -m -- that/file

It may be necessary to run

   git rerere

at this point to save the pre-image of the conflict record, but I'm not sure.

-- Hannes