Re: Improving merge failure message

[Mike Ralphson <mike.ralphson@gmail.com>]

2009/9/8 Junio C Hamano <gitster@pobox.com>:
> I'll leave the exact wording up to other people.  My primary focus was to
> end all of these messages with "Aborting."
>
> This turns out to be a continuation of an older discussion thread back in
> May 2008, and I do not know if anybody took up the challenge back then.  I
> wouldn't be surprised if "checkout", which was the topic of the old
> thread, has some other scary plumbing message still seeping through to the
> UI layer.  Perhaps there are some other commands that needs similar kind
> of love.

Just a note that Documentation/git-checkout.txt references this
message in an example and should be kept in step with the final
wording change. It would be ideal to be able to regression-test the
examples in the documentation somehow but that might involve abusing
the asciidoc markup somewhat.

2009/9/8 Jeff King <peff@peff.net>:
> While we're picking apart your wording, is "clobbered" the word we want
> to use?

If we're debating 'clobbered', then maybe the non-word 'uptodate' is
fair game too? 8-)