From: Jonathan Nieder <jrnieder@gmail.com>
To: Patrick Doyle <wpdster@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: path/to/some/file: needs update
Date: Fri, 3 Dec 2010 12:52:51 -0600 [thread overview]
Message-ID: <20101203185250.GA14049@burratino> (raw)
In-Reply-To: <AANLkTinsUZCUJamUHWN=H7tyL5nKACmEcyvG6hpsTDtv@mail.gmail.com>
Hi,
Patrick Doyle wrote:
> Needless to say, I was able to calm them down. But it occurred to me
> that "needs update" isn't necessarily the most helpful message and
> that "error: ... Cannot merge" could offer a little more explanation.
>
> I'm happy to submit the trivial patch changing "needs update" to
> "locally modified". I suspect there might be some ramifications in
> terms of scripts that expect the old message to be there
[...]
> What do folks think?
I think you are quite right, on both counts.
See v1.6.0-rc0~4 ("needs update" considered harmful, 2008-07-20) and
v1.5.6-rc0~7^2 (unpack-trees: allow Porcelain to give different error
messages, 2008-05-17) for inspiration. Do you remember which
porcelain command was making trouble in this example?
next prev parent reply other threads:[~2010-12-03 18:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 18:34 path/to/some/file: needs update Patrick Doyle
2010-12-03 18:52 ` Jonathan Nieder [this message]
2010-12-03 18:58 ` Matthieu Moy
2010-12-06 0:44 ` Patrick Doyle
2010-12-06 19:06 ` Neal Kreitzinger
2010-12-06 19:19 ` Neal Kreitzinger
2010-12-06 19:23 ` Patrick Doyle
2010-12-06 20:47 ` Ben Walton
2010-12-07 15:23 ` Drew Northup
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=20101203185250.GA14049@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=wpdster@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;
as well as URLs for NNTP newsgroup(s).