On 2021-06-02 20:00:25+0900, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Johannes Sixt <j6t@xxxxxxxx> 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. -- Danh
