Re: [PATCH v2] push: point to 'git pull' and 'git push --force' in case of non-fast forward

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 9, 2009, 20:22 UTC
Message-ID: <7vljls7n4v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpq63cwdee3.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

Show 10 quoted lines

>> So how about phrasing it like this?
>>
>>     Non-fast forward pushes were rejected because you would discard remote
>>     changes you have not seen.  Integrate them with your changes and then
>>     push again. See 'non-fast forward' section of 'git push --help'.
>
> I thing not pointing to 'git pull' in the message really defeats the
> purpose of the patch. I don't find an error message only telling me
> "go read the doc as you should have done from the beginning" really
> helps.

What the above three lines does much more than that.

If you read "would discard remote changes" and understand that it is what you want, then you may know to try --force, without having to read the doc, or if you do not remember --force, "git push --help" would remind you.

If you read "Integrate them with your changes" and understand that it is talking about "git pull" or "git pull --rebase", then you do not have to read the doc. It should "click".

If you lack such a basic understanding, you are better off go reading the doc after all.