Re: [PATCH 0/7] [doc] Add new page on merge conflicts

From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Oct 6, 2026, 17:09 UTC
Message-ID: <CALnO6CBBL6f-HTVtHOf2TrgYV3SCTLU3Jw8amJ6MTM+DHQ+5TQ@mail.gmail.com>
In-Reply-To: <CALnO6CAG-z8B2zXj+QEvZNb-Ufiq=qgyPR5VvQShyH1H_+bgNA@mail.gmail.com>

On Tue, Oct 6, 2026 at 12:53 PM D. Ben Knoble <ben.knoble@gmail.com> wrote:

>
> I'd love to hear from others on either changing status output to
> recommend "merge --continue" or admitting that, for merges, "commit"
> is the same thing.

I see now there's a patch in-flight (downside of reading mail oldest to newest). I'll expect to discuss this particular point there, thanks!

-- 
D. Ben Knoble

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