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

Re: Improving merge failure message

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Sep 8, 2009, 07:20 UTC
Message-ID
<fabb9a1e0909080020i3daa92aar952fc5102df62bdb@mail.gmail.com>
In-Reply-To
<7veiqhgb4y.fsf@alter.siamese.dyndns.org>
Heya,
On Tue, Sep 8, 2009 at 09:15, Junio C Hamano<gitster@pobox.com> wrote:
> +               /* would_overwrite */
> +               "Your local changes to '%s' will be clobbered by merge.  Aborting.",
Still scary, shouldn't that be s/will be/would be/ ?
> +               /* not_uptodate_file */
> +               "Your local changes to '%s' will be clobbered by merge.  Aborting.",
Ditto.
> +               /* not_uptodate_dir */
> +               "Updating '%s' would lose untracked files in it.  Aborting.",
Not sure, but maybe s/in it//
-- 
Cheers,

Sverre Rabbelier
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 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.