From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Mon, 11 Feb 2008 10:21:38 GMT
Subject: Re: fatal: Entry 'xxx' not uptodate. Cannot merge.
Message-ID: <vpqwspbyerx.fsf@bauges.imag.fr>
In-Reply-To: <30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com>

"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