From: Jakub Narebski <jnareb@gmail.com>
To: "Donuvi Tanoga" <donuvitanoga@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: fatal: Entry 'xxx' not uptodate. Cannot merge.
Date: Mon, 11 Feb 2008 03:03:13 -0800 (PST) [thread overview]
Message-ID: <m37ihbg3h0.fsf@localhost.localdomain> (raw)
In-Reply-To: <30929dfe0802102248p1f1cca44q4cec26a3237a3f20@mail.gmail.com>
"Donuvi Tanoga" <donuvitanoga@gmail.com> writes:
> 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
prev parent reply other threads:[~2008-02-11 11:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-11 6:48 fatal: Entry 'xxx' not uptodate. Cannot merge Donuvi Tanoga
2008-02-11 10:21 ` Matthieu Moy
2008-02-11 10:44 ` Donuvi Tanoga
2008-02-11 11:03 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m37ihbg3h0.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=donuvitanoga@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).