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.
