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

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

From
Sitaram Chamarty <sitaramc@gmail.com>
Date
Dec 15, 2008, 01:03 UTC
Message-ID
<gi4adq$cr1$1@ger.gmane.org>
In-Reply-To
<874p16puuq.fsf@hades.wkstn.nix>
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'.

Previous: NixNext: Junio C Hamano
Message 4 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.