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

Re: [PATCH 1/2] push: avoid suggesting "merging" remote changes

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jul 8, 2013, 13:47 UTC
Message-ID
<vpqd2qtkvtk.fsf@anie.imag.fr>
In-Reply-To
<2a6f4a3c31e667aa03b06ce63ae5319a25beaca0.1373223663.git.john@keeping.me.uk>
John Keeping <john@keeping.me.uk> writes:
Show 6 quoted lines
>  static const char message_advice_pull_before_push[] =
>  	N_("Updates were rejected because the tip of your current branch is behind\n"
> -	   "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
> -	   "before pushing again.\n"
> +	   "its remote counterpart. Integrate the remote changes (e.g.\n"
> +	   "'git pull ...') before pushing again.\n"

To me, "merge" includes "rebase", so I'd say the merge -> integrate change is not needed, but I have nothing against it either.

The "..." added are a bit weird with the quotes around. Quotes may suggest that the content is to be taken literally, which is not the case anymore. Not a real objection anyway, just thinking aloud.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: John KeepingNext: John Keeping
Message 3 of 5 in “Avoid suggestions to "merge" remote changes”
  1. 0/2 Avoid suggestions to "merge" remote changesJohn Keeping, Jul 7, 2013
  2. 1/2 push: avoid suggesting "merging" remote changesJohn Keeping, Jul 7, 2013
  3. Matthieu MoyJul 8, 2013
  4. John KeepingJul 8, 2013
  5. 2/2 pull: change the description to "integrate" changesJohn Keeping, Jul 7, 2013

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.