* fatal: Entry 'xxx' not uptodate. Cannot merge.
@ 2008-02-11 6:48 Donuvi Tanoga
2008-02-11 10:21 ` Matthieu Moy
2008-02-11 11:03 ` Jakub Narebski
0 siblings, 2 replies; 4+ messages in thread
From: Donuvi Tanoga @ 2008-02-11 6:48 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: fatal: Entry 'xxx' not uptodate. Cannot merge.
2008-02-11 6:48 fatal: Entry 'xxx' not uptodate. Cannot merge Donuvi Tanoga
@ 2008-02-11 10:21 ` Matthieu Moy
2008-02-11 10:44 ` Donuvi Tanoga
2008-02-11 11:03 ` Jakub Narebski
1 sibling, 1 reply; 4+ messages in thread
From: Matthieu Moy @ 2008-02-11 10:21 UTC (permalink / raw)
To: Donuvi Tanoga; +Cc: git
"Donuvi Tanoga" <donuvitanoga@gmail.com> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: fatal: Entry 'xxx' not uptodate. Cannot merge.
2008-02-11 10:21 ` Matthieu Moy
@ 2008-02-11 10:44 ` Donuvi Tanoga
0 siblings, 0 replies; 4+ messages in thread
From: Donuvi Tanoga @ 2008-02-11 10:44 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git
Thank you Matthieu.
On Feb 11, 2008 12:21 PM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:
>
> "Donuvi Tanoga" <donuvitanoga@gmail.com> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: fatal: Entry 'xxx' not uptodate. Cannot merge.
2008-02-11 6:48 fatal: Entry 'xxx' not uptodate. Cannot merge Donuvi Tanoga
2008-02-11 10:21 ` Matthieu Moy
@ 2008-02-11 11:03 ` Jakub Narebski
1 sibling, 0 replies; 4+ messages in thread
From: Jakub Narebski @ 2008-02-11 11:03 UTC (permalink / raw)
To: Donuvi Tanoga; +Cc: git
"Donuvi Tanoga" <donuvitanoga@gmail.com> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-02-11 11:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-11 6:48 fatal: Entry 'xxx' not uptodate. Cannot merge Donuvi Tanoga
2008-02-11 10:21 ` Matthieu Moy
2008-02-11 10:44 ` Donuvi Tanoga
2008-02-11 11:03 ` Jakub Narebski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).