git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Unexpected git merge exit code when killing merge driver during ancestor merge

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 13, 2024, 22:22 UTC
Message-ID
<xmqqo784jxdu.fsf@gitster.g>
In-Reply-To
<CABPp-BFrcNLA-714gw+JogtAQLhmcs_sLnkkaBiGERF+riwZLQ@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
> Again, sorry for the delay.  For those reading through the archives, I
> posted a fix to this and a few other issues found while investigating
> this problem over here:
> https://lore.kernel.org/git/pull.1748.git.1718310307.gitgitgadget@gmail.com/
Thanks for a pleasant read.  It mostly looked fine.  Queued.
Previous: Elijah Newren
Message 5 of 5 in “Unexpected git merge exit code when killing merge driver during ancestor merge”
  1. Matt CreeApr 4, 2024
  2. brian m. carlsonApr 5, 2024
  3. Elijah NewrenMay 9, 2024
  4. Elijah NewrenJun 13, 2024
  5. Junio C HamanoJun 13, 2024

Read the whole thread, see it on lore, or plain text.

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