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

Re: [BUG] fatal error during merge

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 14, 2008, 00:29 UTC
Message-ID
<7vfxlvf8up.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<48332.N1gUGH5fRhE=.1226619243.squirrel@webmail.hotelhot.dk>
"Anders Melchiorsen" <mail@cup.kalibalik.dk> writes:
> Your patch got rid of the errors and it commits the merged tree. But the
> working tree is not updated correctly, so the moved file disappears.

Isn't this a long known breakage of D/F conflict check logic in merge-recursive backend?

Previous: Anders MelchiorsenNext: Alex Riesen
Message 12 of 14 in “[BUG] fatal error during merge”
  1. Anders MelchiorsenNov 13, 2008
  2. Samuel TardieuNov 13, 2008
  3. SZEDER GáborNov 13, 2008
  4. Anders MelchiorsenNov 13, 2008
  5. Samuel TardieuNov 13, 2008
  6. SZEDER GáborNov 13, 2008
  7. Anders MelchiorsenNov 13, 2008
  8. SZEDER GáborNov 13, 2008
  9. Anders MelchiorsenNov 13, 2008
  10. Alex RiesenNov 13, 2008
  11. Anders MelchiorsenNov 13, 2008
  12. Junio C HamanoNov 14, 2008
  13. Alex RiesenNov 14, 2008
  14. Anders MelchiorsenNov 14, 2008

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.