Re: [RFC/PATCH 4/7] rerere: fix crash when conflict goes unresolved

From: Junio C Hamano <gitster@pobox.com>
Date: May 25, 2018, 01:20 UTC
Message-ID: <xmqqtvqwpm3r.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180524185425.GB18193@hank.intra.tgummerer.com>

Thomas Gummerer <t.gummerer@gmail.com> writes:

> Sorry I botched the description here, and failed to describe what the
> code is actually doing.  We're actually only removing the variant in
> the MERGE_RR file, whose path we are now no longer able to handle.

Oh, that's absolutely fine, then.  Thanks for a prompt update.

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