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

fatal: Entry 'xxx' not uptodate. Cannot merge.

From
DTDonuvi Tanoga <donuvitanoga@gmail.com>
Date
Feb 11, 2008, 06:48 UTC
Message-ID
<30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com>
Hi Everyone,
I have a problem I don't know how to solve.
When I do git pull (on linus' tree), I get the following:

Updating 9b73e76..19af355 fs/binfmt_elf.c: needs update fatal: Entry 'fs/binfmt_elf.c' not uptodate. Cannot merge.

This is 100% my fault, and not a bug (I probably accidentally changed it or something).

Can you please help me to fix it ?

Thank you all Donuvi

Next: Matthieu Moy
Message 1 of 4 in “fatal: Entry 'xxx' not uptodate. Cannot merge.”
  1. Donuvi TanogaFeb 11, 2008
  2. Matthieu MoyFeb 11, 2008
  3. Donuvi TanogaFeb 11, 2008
  4. Jakub NarebskiFeb 11, 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.