Re: [PATCH 0/1] Object ID support for git merge-file

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Oct 29, 2023, 10:15 UTC
Message-ID: <80c6b0d9-7d6c-4a1c-ba2e-330786b13cf0@gmail.com>
In-Reply-To: <CABPp-BFJn5NsSaaxEMpicqND_-8CBw370kyBQuKHGOX-3PRyMw@mail.gmail.com>

On 29/10/2023 06:24, Elijah Newren wrote:

Show 8 quoted lines

> On Tue, Oct 24, 2023 at 12:58 PM brian m. carlson
>> This is in use at
>> GitHub to produce conflict diffs when a merge fails, and it seems
>> generally useful, so I'm sending it here.
> 
> But...wouldn't you already have the conflicts generated when doing the
> merge and learning that it fails?  Why would you need to generate them
> again?

I was surprised by this as well, but as you say this seems like a useful addition independent of any specific use at GitHub.

Best Wishes

Phillip

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