From: "Jay Soffian" <jaysoffian@gmail.com>
To: "Jakub Narebski" <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: "git checkout" branch switching safety broken in 'next'
Date: Mon, 10 Mar 2008 09:56:40 -0400 [thread overview]
Message-ID: <76718490803100656k6607e00ar1cce14aedffb3b27@mail.gmail.com> (raw)
In-Reply-To: <fr2v0s$cdb$1@ger.gmane.org>
2008/3/10 Jakub Narebski <jnareb@gmail.com>:
> Junio C Hamano wrote:
> > 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...
+1. Most concise is probably:
* "error: 'foo' has uncommitted changes."
More helpful messages that I can think of are probably too verbose. e.g.:
* "error: 'foo' differs in target branch but has uncommitted changes."
* "error: 'foo' has uncommitted changes. Commit, use -f to lose
changes, or -m to merge changes in target branch."
j.
next prev parent reply other threads:[~2008-03-10 13:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-10 8:12 "git checkout" branch switching safety broken in 'next' Junio C Hamano
2008-03-10 9:29 ` Jakub Narebski
2008-03-10 13:56 ` Jay Soffian [this message]
2008-03-11 8:57 ` setting git-gui locale Maxim Fridental
2008-03-11 10:01 ` Johannes Schindelin
2008-03-10 14:38 ` "git checkout" branch switching safety broken in 'next' Linus Torvalds
2008-03-11 2:41 ` "git diff-index" " Junio C Hamano
2008-03-11 3:20 ` Linus Torvalds
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=76718490803100656k6607e00ar1cce14aedffb3b27@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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