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

From: Julia Evans <julia@jvns.ca>
Date: Sep 28, 2026, 20:41 UTC
Message-ID: <01f196af-3a6a-40e6-86c9-f8b4ce7bfe47@app.fastmail.com>
In-Reply-To: <20260924233726.GB765100@coredump.intra.peff.net>

> I think that is giving us a good signal, though. The guide should be
> mentioned in command-list.txt, so that it is linked from git(1).

Thanks, will fix this (and will move the conflict-marker-size change).

Should I be trying to apply my patches to `seen` before submitting them?

- Julia

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