git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Improving merge failure message

From
Jeff King <peff@peff.net>
Date
Sep 8, 2009, 07:51 UTC
Message-ID
<20090908075156.GA19294@coredump.intra.peff.net>
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
Previous: Junio C HamanoNext: Mike Ralphson
Message 6 of 11 in “Improving merge failure message”
  1. Nanako ShiraishiSep 8, 2009
  2. Junio C HamanoSep 8, 2009
  3. Junio C HamanoSep 8, 2009
  4. Sverre RabbelierSep 8, 2009
  5. Junio C HamanoSep 8, 2009
  6. Jeff KingSep 8, 2009
  7. Mike RalphsonSep 8, 2009
  8. Junio C HamanoSep 8, 2009
  9. Alex RiesenSep 8, 2009
  10. Nanako ShiraishiSep 8, 2009
  11. Johannes SixtSep 8, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.