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

From: Matthieu Moy <[email-masked]>
Date: Mon, 08 Jul 2013 15:47:19 +0200

John Keeping <[email-masked]> writes:

>  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/