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

Re: Problems with GIT under Windows - "not uptodate"

From
EREric Raible <raible@gmail.com>
Date
Sep 1, 2009, 16:52 UTC
Message-ID
<loom.20090901T184650-434@post.gmane.org>
In-Reply-To
<a21e6af7ee05f56fd8c02d0955af1c72.squirrel@localhost>
 <david.hagood <at> gmail.com> writes:
> Error: Entry "Some file name" not uptodate: cannot merge.
> 
> We've tried "git reset --hard; git pull ." We've tried "git reset --hard;
> git checkout -f master". Neither seems to fix this.
http://article.gmane.org/gmane.comp.version-control.git/122862
Previous: david.hagood@gmail.comNext: Johannes Schindelin
Message 2 of 7 in “Problems with GIT under Windows - "not uptodate"”
  1. david.hagood@gmail.comSep 1, 2009
  2. Eric RaibleSep 1, 2009
  3. Johannes SchindelinSep 1, 2009
  4. Eric RaibleSep 1, 2009
  5. Johannes SchindelinSep 1, 2009
  6. skillzero@gmail.comSep 1, 2009
  7. david.hagood@gmail.comSep 1, 2009

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.