From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
Nanako Shiraishi <nanako3@lavabit.com>,
git@vger.kernel.org
Subject: Re: Improving merge failure message
Date: Tue, 8 Sep 2009 03:51:56 -0400 [thread overview]
Message-ID: <20090908075156.GA19294@coredump.intra.peff.net> (raw)
In-Reply-To: <7vk509ev20.fsf@alter.siamese.dyndns.org>
On Tue, Sep 08, 2009 at 12:48:23AM -0700, Junio C Hamano wrote:
> Thanks, very true indeed. "It would be clobbered if we were to continue
> hence we abort." is how we want to explain our behaviour, so "would" is
> definitely better here.
While we're picking apart your wording, is "clobbered" the word we want
to use? Everywhere else that is user-facing we tend to use the term
"overwritten".
-Peff
next prev parent reply other threads:[~2009-09-08 7:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-08 6:31 Improving merge failure message Nanako Shiraishi
2009-09-08 6:47 ` Junio C Hamano
2009-09-08 7:15 ` Junio C Hamano
2009-09-08 7:20 ` Sverre Rabbelier
2009-09-08 7:48 ` Junio C Hamano
2009-09-08 7:51 ` Jeff King [this message]
2009-09-08 7:59 ` Mike Ralphson
2009-09-08 16:34 ` Junio C Hamano
2009-09-08 9:11 ` Alex Riesen
2009-09-08 10:12 ` Nanako Shiraishi
2009-09-08 8:24 ` Johannes Sixt
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=20090908075156.GA19294@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.com \
--cc=srabbelier@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).