{"thread":{"id":"12023","subject":"fatal: Entry 'xxx' not uptodate. Cannot merge.","startedAt":"2008-02-11T06:48:42Z","lastAt":"2008-02-11T11:03:13Z","messageCount":4,"participants":["Donuvi Tanoga","Matthieu Moy","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"68329","messageId":"30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com","threadId":"12023","inReplyTo":null,"subject":"fatal: Entry 'xxx' not uptodate. Cannot merge.","fromName":"Donuvi Tanoga","fromEmail":"donuvitanoga@gmail.com","sentAt":"2008-02-11T06:48:42Z","receivedAt":"2008-02-11T06:48:42Z","isPatch":false,"sender":{"key":"donuvitanoga@gmail.com","avatar":null},"body":"Hi Everyone,\n\nI have a problem I don't know how to solve.\n\nWhen I do git pull (on linus' tree), I get the following:\n\nUpdating 9b73e76..19af355\nfs/binfmt_elf.c: needs update\nfatal: Entry 'fs/binfmt_elf.c' not uptodate. Cannot merge.\n\nThis is 100% my fault, and not a bug (I probably\naccidentally changed it or something).\n\nCan you please help me to fix it ?\n\nThank you all\nDonuvi\n"},{"id":"68363","messageId":"vpqwspbyerx.fsf@bauges.imag.fr","threadId":"12023","inReplyTo":"30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com","subject":"Re: fatal: Entry 'xxx' not uptodate. Cannot merge.","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2008-02-11T10:21:38Z","receivedAt":"2008-02-11T10:21:38Z","isPatch":false,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"\"Donuvi Tanoga\" <donuvitanoga@gmail.com> writes:\n\n> Hi Everyone,\n>\n> I have a problem I don't know how to solve.\n>\n> When I do git pull (on linus' tree), I get the following:\n>\n> Updating 9b73e76..19af355\n> fs/binfmt_elf.c: needs update\n> fatal: Entry 'fs/binfmt_elf.c' not uptodate. Cannot merge.\n>\n> This is 100% my fault, and not a bug (I probably\n> accidentally changed it or something).\n>\n> Can you please help me to fix it ?\n\nRun \"git status\", it will point you to the modifications you did in a\nslightly more user-friendly format.\n\nGit doesn't allow a merge if you have uncommited changes, either your\nchanges are irrelevant and you want to \"git reset --hard\", or they\nare, and you want to commit (and perhaps use \"rebase\"), or stash them.\n\n-- \nMatthieu\n"},{"id":"68368","messageId":"30929dfe0802110244x2912cecfp2f4c4c91236227fe@mail.gmail.com","threadId":"12023","inReplyTo":"vpqwspbyerx.fsf@bauges.imag.fr","subject":"Re: fatal: Entry 'xxx' not uptodate. Cannot merge.","fromName":"Donuvi Tanoga","fromEmail":"donuvitanoga@gmail.com","sentAt":"2008-02-11T10:44:51Z","receivedAt":"2008-02-11T10:44:51Z","isPatch":false,"sender":{"key":"donuvitanoga@gmail.com","avatar":null},"body":"Thank you Matthieu.\n\nOn Feb 11, 2008 12:21 PM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:\n>\n> \"Donuvi Tanoga\" <donuvitanoga@gmail.com> writes:\n>\n> > Hi Everyone,\n> >\n> > I have a problem I don't know how to solve.\n> >\n> > When I do git pull (on linus' tree), I get the following:\n> >\n> > Updating 9b73e76..19af355\n> > fs/binfmt_elf.c: needs update\n> > fatal: Entry 'fs/binfmt_elf.c' not uptodate. Cannot merge.\n> >\n> > This is 100% my fault, and not a bug (I probably\n> > accidentally changed it or something).\n> >\n> > Can you please help me to fix it ?\n>\n> Run \"git status\", it will point you to the modifications you did in a\n> slightly more user-friendly format.\n>\n> Git doesn't allow a merge if you have uncommited changes, either your\n> changes are irrelevant and you want to \"git reset --hard\", or they\n> are, and you want to commit (and perhaps use \"rebase\"), or stash them.\n>\n> --\n> Matthieu\n>\n"},{"id":"68372","messageId":"m37ihbg3h0.fsf@localhost.localdomain","threadId":"12023","inReplyTo":"30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com","subject":"Re: fatal: Entry 'xxx' not uptodate. Cannot merge.","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-02-11T11:03:13Z","receivedAt":"2008-02-11T11:03:13Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"\"Donuvi Tanoga\" <donuvitanoga@gmail.com> writes:\n\n> I have a problem I don't know how to solve.\n> \n> When I do git pull (on linus' tree), I get the following:\n> \n> Updating 9b73e76..19af355\n> fs/binfmt_elf.c: needs update\n> fatal: Entry 'fs/binfmt_elf.c' not uptodate. Cannot merge.\n> \n> This is 100% my fault, and not a bug (I probably\n> accidentally changed it or something).\n> \n> Can you please help me to fix it ?\n\nhttp://git.or.cz/gitwiki/GitFaq#head-6f976e553404993ae6353d939a7fb3f3321208d8\n\nAlthough I think that this error message could be improved.\nThis message from what I see is from the ancient times, before\neven v0.99 (commit 02ede67ad45973f9f8d07db7).\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}