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

Re: [PATCH 2/2 v2] user-manual: Document that "git merge" doesn't like uncommited changes.

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 23, 2009, 00:08 UTC
Message-ID
<7vpr7aayry.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1258928778-32419-2-git-send-email-Matthieu.Moy@imag.fr>
Looks much nicer; thanks.
Will queue.
Previous: Matthieu Moy
Message 12 of 12 in “Explain newbies the "commit before pull" flow”
  1. 0/2 Explain newbies the "commit before pull" flowMatthieu Moy, Nov 20, 2009
  2. 1/2 merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy, Nov 20, 2009
  3. Junio C HamanoNov 20, 2009
  4. Matthieu MoyNov 22, 2009
  5. 2/2 user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy, Nov 20, 2009
  6. Junio C HamanoNov 20, 2009
  7. Matthieu MoyNov 22, 2009
  8. Junio C HamanoNov 22, 2009
  9. Matthieu MoyNov 23, 2009
  10. 1/2 merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy, Nov 22, 2009
  11. 2/2 user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy, Nov 22, 2009
  12. Junio C HamanoNov 23, 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.