# fatal: Entry 'xxx' not uptodate. Cannot merge. 4 messages from 2008-02-11 to 2008-02-11. Participants: Donuvi Tanoga, Matthieu Moy, Jakub Narebski. Thread: https://gitlist.dev/t/12023 ## Donuvi Tanoga, 2008-02-11 06:48 Subject: fatal: Entry 'xxx' not uptodate. Cannot merge. Message-ID: <30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com> URL: https://gitlist.dev/e/30929dfe0802102248p1f1cca44q4cec26a3237a3f20%40mail.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 ``` ## Matthieu Moy, 2008-02-11 10:21 Subject: Re: fatal: Entry 'xxx' not uptodate. Cannot merge. Message-ID: URL: https://gitlist.dev/e/vpqwspbyerx.fsf%40bauges.imag.fr In-Reply-To: <30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com> ``` "Donuvi Tanoga" writes: > 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 ? Run "git status", it will point you to the modifications you did in a slightly more user-friendly format. Git doesn't allow a merge if you have uncommited changes, either your changes are irrelevant and you want to "git reset --hard", or they are, and you want to commit (and perhaps use "rebase"), or stash them. -- Matthieu ``` ## Donuvi Tanoga, 2008-02-11 10:44 Subject: Re: fatal: Entry 'xxx' not uptodate. Cannot merge. Message-ID: <30929dfe0802110244x2912cecfp2f4c4c91236227fe@mail.gmail.com> URL: https://gitlist.dev/e/30929dfe0802110244x2912cecfp2f4c4c91236227fe%40mail.gmail.com In-Reply-To: ``` Thank you Matthieu. On Feb 11, 2008 12:21 PM, Matthieu Moy wrote: > > "Donuvi Tanoga" writes: > > > 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 ? > > Run "git status", it will point you to the modifications you did in a > slightly more user-friendly format. > > Git doesn't allow a merge if you have uncommited changes, either your > changes are irrelevant and you want to "git reset --hard", or they > are, and you want to commit (and perhaps use "rebase"), or stash them. > > -- > Matthieu > ``` ## Jakub Narebski, 2008-02-11 11:03 Subject: Re: fatal: Entry 'xxx' not uptodate. Cannot merge. Message-ID: URL: https://gitlist.dev/e/m37ihbg3h0.fsf%40localhost.localdomain In-Reply-To: <30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com> ``` "Donuvi Tanoga" writes: > 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 ? http://git.or.cz/gitwiki/GitFaq#head-6f976e553404993ae6353d939a7fb3f3321208d8 Although I think that this error message could be improved. This message from what I see is from the ancient times, before even v0.99 (commit 02ede67ad45973f9f8d07db7). -- Jakub Narebski Poland ShadeHawk on #git ```