From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rich Pixley Subject: Re: Newbie grief Date: Thu, 03 May 2012 15:39:09 -0700 Message-ID: <4FA3090D.5080406@palm.com> References: <4F9F128C.5020304@palm.com> <201204302331.q3UNVo7o032303@no.baka.org> <4F9F28F5.2020403@palm.com> <201205010137.q411bxaU002449@no.baka.org> <4F9F52B9.9060508@palm.com> <08704bd2e32343a4b9def80e4fa1efa2-mfwitten@gmail.com> <4FA2D8EA.7030809@palm.com> <87obq5ggpu.fsf@an-dro.info.enstb.org> <7vehr1dl2z.fsf@alter.siamese.dyndns.org> <4FA307C5.102@palm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Ronan Keryell , "git@vger.kernel.org" To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri May 04 00:39:16 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SQ4g7-0006yM-5j for gcvg-git-2@plane.gmane.org; Fri, 04 May 2012 00:39:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758947Ab2ECWjM (ORCPT ); Thu, 3 May 2012 18:39:12 -0400 Received: from smtp-relay2.palm.com ([64.28.152.243]:14267 "EHLO smtp-relay2.palm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756344Ab2ECWjL (ORCPT ); Thu, 3 May 2012 18:39:11 -0400 X-IronPort-AV: E=Sophos;i="4.75,527,1330934400"; d="scan'208";a="13299012" Received: from unknown (HELO ushqusdns4.palm.com) ([148.92.223.164]) by smtp-relay2.palm.com with ESMTP; 03 May 2012 15:39:10 -0700 Received: from joso.noir.com ([10.100.2.3]) by ushqusdns4.palm.com (8.14.4/8.14.4) with ESMTP id q43Md915014665; Thu, 3 May 2012 15:39:09 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:12.0) Gecko/20120420 Thunderbird/12.0 In-Reply-To: <4FA307C5.102@palm.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 5/3/12 15:33 , Rich Pixley wrote: > On 5/3/12 14:13 , Junio C Hamano wrote: >> Ronan Keryell writes: >>>>>>>> On Thu, 03 May 2012 12:13:46 -0700, Rich Pixley said: >>> Rich> * the hg error messages are straightforward, clear, and don't >>> Rich> require any deep knowledge of the source code control system >>> Rich> or it's limitations. (I still don't understand what the git >>> Rich> message on collision is saying.) >>> >>> This is a very good suggestion. >>> ... >>> At least, print a simpler message with some typical use case causing >>> this and some workflow ideas before the detailed explanation. >> It indeed is a good starting point to make a suggestion, but there is >> nothing actionable in the above by itself, especially since "typical use >> case" is quite different for different Git users. > How about, "Your push can't be made because it would cause an > irreconcilable collision. You probably want to pull and merge before > attempting to push again." Er... "Your push can't be made because it would cause an irreconcilable collision. You probably want to fetch and merge before attempting to push again." --rich