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

Re: Automatic merge failed, fix up by hand

From
Junio C Hamano <junkio@cox.net>
Date
Aug 23, 2005, 22:06 UTC
Message-ID
<7vhddgnw9q.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<1124831571.13042.27.camel@firebird.lenb.worldpath.net>
Len Brown <len.brown@intel.com> writes:
> The merge issue below is reproduced in a "git clone -l" copy
> with no plain files present.

Meaning you did not have any file in the working tree? It seems to me that what is happenning is the resolve is trying to merge the head of your tree and from-linus, but at the same time it notices that you removed those files from your working tree and thinks that is what you would want to do.

I could get to 81065e2f415af6... commit (Linus tip at this moment), so if you can tell me where to snarf the other commit (702c7e76....) that would help me diagnose the problem a lot.

Thanks.
Previous: Len BrownNext: Len Brown
Message 2 of 12 in “Automatic merge failed, fix up by hand”
  1. Len BrownAug 23, 2005
  2. Junio C HamanoAug 23, 2005
  3. Len BrownAug 23, 2005
  4. Junio C HamanoAug 23, 2005
  5. Junio C HamanoAug 24, 2005
  6. Junio C HamanoAug 24, 2005
  7. Linus TorvaldsAug 24, 2005
  8. Junio C HamanoAug 24, 2005
  9. Len BrownAug 24, 2005
  10. Daniel BarkalowAug 24, 2005
  11. Len BrownAug 24, 2005
  12. Linus TorvaldsAug 24, 2005

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.