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

Re: Update message_advice_pull_before_push to mention how to push after rebasing

From
ZKzhang kai <kylerzhang11@gmail.com>
Date
Mar 29, 2024, 07:41 UTC
Message-ID
<CAK_130R-AM6ZKJe52hc_XaLwi++VKm_bW5Ar8m8Yo7JLUnt9Yw@mail.gmail.com>
In-Reply-To
<xmqq5xx6uume.fsf@gitster.g>
Show 6 quoted lines
> True, but isn't that a slipperly slope to cram more and more of the
> material from the manual into the "hint" that is supposed to be
> short, helpful and not so obnoxious?  Perhaps removing "pull again
> before you push", and saying "updates were rejected because X; see
> the note about fast-forwards in the manual" and nothing else would
> be an improvement?

I agree. Removing "pull again before you push" is definitely an improvement for our workflow. But I know some teams don't use rebase at all, so it may not be ideal for them.

Previous: Junio C Hamano
Message 6 of 6 in “Update message_advice_pull_before_push to mention how to push after rebasing”
  1. zhang kaiMar 28, 2024
  2. Rubén JustoMar 28, 2024
  3. Junio C HamanoMar 28, 2024
  4. zhang kaiMar 28, 2024
  5. Junio C HamanoMar 28, 2024
  6. zhang kaiMar 29, 2024

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.