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

Re: git pull suggestion

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 10, 2010, 04:40 UTC
Message-ID
<7vochrzzqc.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20100410043535.GA22481@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 6 quoted lines
>   Your local changes to '%s' would be overwritten by merge.  Aborting.
>   Please, commit your changes or stash them before you can merge.
>
> What version of git are you using? If you (or others you are helping)
> saw that message and it wasn't helpful, do you have any suggestions for
> how to improve it?

I use 1.7.1-rc0 myself, but dropping comma after "Please" may make it a bit easier to read IMHO ;-).

Previous: Jeff KingNext: Aghiles
Message 9 of 15 in “git pull suggestion”
  1. AghilesApr 7, 2010
  2. Thomas RastApr 8, 2010
  3. AghilesApr 8, 2010
  4. Nicolas SebrechtApr 8, 2010
  5. AghilesApr 9, 2010
  6. Jeff KingApr 9, 2010
  7. AghilesApr 9, 2010
  8. Jeff KingApr 10, 2010
  9. Junio C HamanoApr 10, 2010
  10. AghilesApr 11, 2010
  11. Junio C HamanoApr 11, 2010
  12. Matthieu MoyApr 11, 2010
  13. AghilesApr 12, 2010
  14. Junio C HamanoApr 12, 2010
  15. AghilesApr 9, 2010

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.