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

From: Donuvi Tanoga <donuvitanoga@gmail.com>
Date: Feb 11, 2008, 10:44 UTC
Message-ID: <30929dfe0802110244x2912cecfp2f4c4c91236227fe@mail.gmail.com>
In-Reply-To: <vpqwspbyerx.fsf@bauges.imag.fr>

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
>