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

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 2, 2026, 21:38 UTC
Message-ID: <xmqqjynzvl4w.fsf@gitster.g>
In-Reply-To: <7861e492-6fa4-4768-afdd-65cd346b85be@app.fastmail.com>

"Julia Evans" <julia@jvns.ca> writes:

Show 6 quoted lines

>>  - "cannot guess" would be more direct than "will not try to guess".
>
> The way I think about it as a user is that Git takes an intentionally conservative
> approach and I appreciate the conservatism. Compared to a more aggressive
> syntax-aware merge system like `mergiraf` which has done merges I don't
> agree with.

Your disagreement with their result suggests that they guessed when they could not do so reliably. I agree that our approach is more conservative, but we can call it being more honest.

;-).

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