From: Han-Wen Nienhuys <hanwen@xs4all.nl>
To: git@vger.kernel.org
Subject: git UI nit
Date: Wed, 06 Dec 2006 15:22:32 +0100 [thread overview]
Message-ID: <el6jmt$mej$1@sea.gmane.org> (raw)
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 reply other threads:[~2006-12-06 14:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-06 14:22 Han-Wen Nienhuys [this message]
2006-12-06 14:46 ` git UI nit Johannes Schindelin
2006-12-06 15:09 ` Han-Wen Nienhuys
2006-12-06 15:20 ` Johannes Schindelin
2006-12-06 15:36 ` Jakub Narebski
2006-12-06 16:04 ` Han-Wen Nienhuys
2006-12-06 16:23 ` Jakub Narebski
2006-12-06 15:41 ` Han-Wen Nienhuys
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='el6jmt$mej$1@sea.gmane.org' \
--to=hanwen@xs4all.nl \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).