Re: [PATCH 2/7] [doc] git-merge: link to new merge conflicts guide

From: Patrick Steinhardt <ps@pks.im>
Date: Sep 30, 2026, 13:19 UTC
Message-ID: <ar0MZkCygtK4Qa31@pks.im>
In-Reply-To: <a1686a2d82ef9357ecff07c1247092d3dd5ecf95.1790261062.git.gitgitgadget@gmail.com>

On Thu, Sep 24, 2026 at 02:44:17PM +0000, Julia Evans via GitGitGadget wrote:

> From: Julia Evans <julia@jvns.ca>
> 
> All of the info about merge conflicts has been moved to the new guide

Pedantic nit: missing punctuation.

Other than that I agree with Ben, one part that we lose here is some context on what a merge conflict even is.

Patrick

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