Re: [PATCH v5 0/8] Fix merge restore state

From: Elijah Newren <newren@gmail.com>
Date: Jul 26, 2022, 01:59 UTC
Message-ID: <CABPp-BEMv6r=-Zs4AoachjZxWOVOL2DrZq7CpBEamCnq4vZTWg@mail.gmail.com>
In-Reply-To: <xmqqh7353ti1.fsf@gitster.g>

On Mon, Jul 25, 2022 at 12:03 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > This started as a simple series to fix restore_state() in builtin/merge.c,
> > fixing an issue reported by ZheNing Hu[3]. It now fixes several bugs and has
> > grown so much it's hard to call it simple. Anyway...
>
> Thanks.  Unless we hear any more comments, let's start merging it
> down to 'next' soonish.

Sounds good; let's plan on that.

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