From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Dec 2005 19:27:32 GMT
Subject: Re: [PATCH] Add suggestion to hard-to-understand error message
Message-ID: <7vek45lyor.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <43AA79EB.6040800@op5.se>

Andreas Ericsson <ae@op5.se> writes:

> Junio C Hamano wrote:
>> In a sense, both are "pull first?" situation, and it probably is
>> more confusing to give different messages to the user in these
>> two cases.  From the end-user point of view they are the same
>> "remote is not strict subset.".
>
> In non-git'ish, does this mean "you're not up to date, so pull before 
> pushing" ? If so, why not say so? I'm sure it could prevent a fair few 
> problems for users (not least those new to scm's).

Perhaps.  I was suggesting to say that in *both* places, not
just one.