From: Donuvi Tanoga <donuvitanoga@gmail.com>
Date: Mon, 11 Feb 2008 06:48:42 GMT
Subject: fatal: Entry 'xxx' not uptodate. Cannot merge.
Message-ID: <30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com>

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