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

Re: [PATCH 1/2] merge-recursive: point the user to commit when file would be overwritten.

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Nov 22, 2009, 22:09 UTC
Message-ID
<vpqr5rqi53q.fsf@bauges.imag.fr>
In-Reply-To
<7vskc9vzqg.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> Matthieu Moy <Matthieu.Moy@imag.fr> writes:
>
>> The commit-before-pull is well accepted in the DVCS community, but is
>> confusing some new users. This should get them back in the right way when
>> the problem occurs.
>>
>> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
>
> Don't these extra lines warrant "advice.*" option?

I was thinking this would be overkill for a one-line advice, but it doesn't harm to provide the option. I'll resend the patch with it (it's not _as_ straightforward as it seems to be since the initial structure is static in the function, but still reasonable).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Junio C HamanoNext: Matthieu Moy
Message 4 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.