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

Re: "git checkout" branch switching safety broken in 'next'

From
Jakub Narebski <jnareb@gmail.com>
Date
Mar 10, 2008, 09:29 UTC
Message-ID
<fr2v0s$cdb$1@ger.gmane.org>
In-Reply-To
<7vmyp7j8ui.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
Show 5 quoted lines
> Traditionally, when you have a change in the work tree, and switch to
> another branch that has different contents in the modified path, we
> errored out by saying:
> 
>     error: Entry 'foo' not uptodate. Cannot merge.

By the way, could this error message be made less cryptic? It is there since the very beginning, and was not changed during making error messages more user friendly...

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Junio C HamanoNext: Jay Soffian
Message 2 of 8 in “"git checkout" branch switching safety broken in 'next'”
  1. Junio C HamanoMar 10, 2008
  2. Jakub NarebskiMar 10, 2008
  3. Jay SoffianMar 10, 2008
  4. setting git-gui localeMaxim Fridental, Mar 11, 2008
  5. Johannes SchindelinMar 11, 2008
  6. Linus TorvaldsMar 10, 2008
  7. "git diff-index" broken in 'next'Junio C Hamano, Mar 11, 2008
  8. Linus TorvaldsMar 11, 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.