threads / discuss / 12023

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

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

## tl;dr

4 messages between Feb 11, 2008 and Feb 11, 2008.

replies: 3people: 3as markdown or json

Donuvi Tanoga· Feb 11, 2008, 06:48 UTC · lore

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· Feb 11, 2008, 10:21 UTC · re: Donuvi Tanoga · lore

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

"Donuvi Tanoga" <donuvitanoga@gmail.com> writes:

Show 14 quoted lines

> 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· Feb 11, 2008, 10:44 UTC · re: Matthieu Moy · lore

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

Thank you Matthieu.

On Feb 11, 2008 12:21 PM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:

Show 28 quoted lines

>
> "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
>

Jakub Narebski· Feb 11, 2008, 11:03 UTC · re: Donuvi Tanoga · lore

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

"Donuvi Tanoga" <donuvitanoga@gmail.com> writes:

Show 12 quoted lines

> 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