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

Re: libreoffice merge issue ...

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 15, 2011, 18:46 UTC
Message-ID
<7vaahxp250.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110215094546.GA25530@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> Interesting. I looked at both sides of the merge and the merge base, and
> there definitely should not be a conflict there. The regression bisects
> to 83c9031 (unpack_trees(): skip trees that are the same in all input,
> 2010-12-22). Reverting that commit makes the problem go away.
Thanks; I was wondering about this myself but you bisected it faster.
Will revert.
Previous: Jeff KingNext: Jeff King
Message 6 of 10 in “libreoffice merge issue ...”
  1. Michael MeeksFeb 14, 2011
  2. Norbert ThiebaudFeb 14, 2011
  3. Ferry HubertsFeb 14, 2011
  4. Norbert ThiebaudFeb 14, 2011
  5. Jeff KingFeb 15, 2011
  6. Junio C HamanoFeb 15, 2011
  7. Jeff KingFeb 16, 2011
  8. Junio C HamanoFeb 16, 2011
  9. Damien WyartApr 21, 2011
  10. Jeff KingApr 29, 2011

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.