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

Re: [PATCH] merge-tree: handle directory/empty conflict correctly

From
Junio C Hamano <gitster@pobox.com>
Date
May 7, 2013, 05:17 UTC
Message-ID
<7v61yvnzc2.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CADEJa-5M3Pe+s+Df70AN5XS6UBWHr_BW3KZ4GKHm2d_GXNG+hA@mail.gmail.com>
Andreas Jacobsen <andreas@andreasjacobsen.com> writes:
> On 6 May 2013 17:20, John Keeping <john@keeping.me.uk> wrote:
>> Andreas, can you try this patch and see if it fixes your test case?
>
> Worked perfectly. Thank you, John :)
Thanks, both.
Previous: Andreas Jacobsen
Message 8 of 8 in “Segfault in git merge-tree (1.8.2.2)”
  1. Andreas JacobsenMay 6, 2013
  2. John KeepingMay 6, 2013
  3. Andreas JacobsenMay 6, 2013
  4. John KeepingMay 6, 2013
  5. John KeepingMay 6, 2013
  6. merge-tree: handle directory/empty conflict correctlyJohn Keeping, May 6, 2013
  7. Andreas JacobsenMay 7, 2013
  8. Junio C HamanoMay 7, 2013

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.