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

git UI nit

From
Han-Wen Nienhuys <hanwen@xs4all.nl>
Date
Dec 6, 2006, 14:22 UTC
Message-ID
<el6jmt$mej$1@sea.gmane.org>
When merging changes into a dirty working copy, one may get 
..
Updating 62a005d..7bbd698
Makefile: needs update
README: needs update
config.mak.in: needs update
configure.ac: needs update
fatal: Entry 'Makefile' not uptodate. Cannot merge.
..

This is bad error message; "uptodate" suggests that Makefile is too old. The problem is the reverse. The Makefile has been edited and hence it is 'newer'. 

This message should say 
 Entry 'Makefile' is dirty. 
 Revert or commit changes before merging
-- 
 Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen
Next: Johannes Schindelin
Message 1 of 8 in “git UI nit”
  1. Han-Wen NienhuysDec 6, 2006
  2. Johannes SchindelinDec 6, 2006
  3. Han-Wen NienhuysDec 6, 2006
  4. Johannes SchindelinDec 6, 2006
  5. Jakub NarebskiDec 6, 2006
  6. Han-Wen NienhuysDec 6, 2006
  7. Jakub NarebskiDec 6, 2006
  8. Han-Wen NienhuysDec 6, 2006

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.