From: Johannes Schindelin Date: Wed, 06 Dec 2006 14:46:46 GMT Subject: Re: git UI nit Message-ID: In-Reply-To: Hi, On Wed, 6 Dec 2006, Han-Wen Nienhuys wrote: > > 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'. Something like this? -- snip -- [PATCH] Replace "needs update" by "dirty; needs commit" This should clarify why a merge was not even started. Signed-off-by: Johannes Schindelin --- read-cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/read-cache.c b/read-cache.c index eae4745..0d22de2 100644 --- a/read-cache.c +++ b/read-cache.c @@ -721,7 +721,7 @@ int refresh_cache(unsigned int flags) } if (quiet) continue; - printf("%s: needs update\n", ce->name); + printf("%s: dirty; needs commit\n", ce->name); has_errors = 1; continue;