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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux