git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Possibly-spurious 'not uptodate. Cannot merge'

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 15, 2008, 01:27 UTC
Message-ID
<7vy6yiz0pw.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<gi4adq$cr1$1@ger.gmane.org>
Sitaram Chamarty <sitaramc@gmail.com> writes:
Show 9 quoted lines
> 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.

Previous: Sitaram Chamarty
Message 5 of 5 in “Possibly-spurious 'not uptodate. Cannot merge'”
  1. NixDec 14, 2008
  2. Junio C HamanoDec 14, 2008
  3. NixDec 14, 2008
  4. Sitaram ChamartyDec 15, 2008
  5. Junio C HamanoDec 15, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.