From: Junio C Hamano <gitster@pobox.com>
To: Sitaram Chamarty <sitaramc@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Possibly-spurious 'not uptodate. Cannot merge'
Date: Sun, 14 Dec 2008 17:27:55 -0800 [thread overview]
Message-ID: <7vy6yiz0pw.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <gi4adq$cr1$1@ger.gmane.org> (Sitaram Chamarty's message of "Mon, 15 Dec 2008 01:03:54 +0000 (UTC)")
Sitaram Chamarty <sitaramc@gmail.com> writes:
> On 2008-12-14, Nix <nix@esperi.org.uk> wrote:
>> In this situation, 'git diff' reports no changes at all, but 'git reset
>> --hard' gets the tree back into a state where merging succeeds, as does
>> 'git update-index --refresh'.
>
> Wasn't there some situation in which merely running 'git
> status' would have a similar effect? I seem to recall
> reading that somewhere but now I can't find any mention of
> it in 'git help status'.
It would, but this is a pure bug in the re-implementation of git-merge
that was introduced soon after v1.5.6. The users shouldn't be required to
run refresh to work this around.
prev parent reply other threads:[~2008-12-15 1:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-14 16:47 Possibly-spurious 'not uptodate. Cannot merge' Nix
2008-12-14 19:33 ` Junio C Hamano
2008-12-14 23:15 ` Nix
2008-12-15 1:03 ` Sitaram Chamarty
2008-12-15 1:27 ` Junio C Hamano [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=7vy6yiz0pw.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sitaramc@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.