Re: The git spring cleanup challenge

From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Jun 2, 2021, 11:44 UTC
Message-ID: <YLdvJ0G19LNcbDSD@danh.dev>
In-Reply-To: <xmqqo8co7cqe.fsf@gitster.g>

On 2021-06-02 20:00:25+0900, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

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

-- 
Danh

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