From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Leake Subject: Re: `git stash pop` UX Problem Date: Fri, 28 Feb 2014 11:27:46 -0600 Message-ID: <85vbvz171p.fsf@stephe-leake.org> References: <1lho9x8.1qh70zkp477M%lists@haller-berlin.de> <85fvn40ws9.fsf@stephe-leake.org> <851tynz2yg.fsf@stephe-leake.org> Mime-Version: 1.0 Content-Type: text/plain To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Feb 28 18:27:57 2014 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 1WJRE2-0007Bg-G2 for gcvg-git-2@plane.gmane.org; Fri, 28 Feb 2014 18:27:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753154AbaB1R1u (ORCPT ); Fri, 28 Feb 2014 12:27:50 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.232]:40567 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752460AbaB1R1u (ORCPT ); Fri, 28 Feb 2014 12:27:50 -0500 Received: from [75.87.81.6] ([75.87.81.6:49274] helo=TAKVER) by cdptpa-oedge02 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id D7/E0-30151-417C0135; Fri, 28 Feb 2014 17:27:49 +0000 In-Reply-To: (Matthieu Moy's message of "Fri, 28 Feb 2014 16:42:40 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (windows-nt) X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Matthieu Moy writes: > Stephen Leake writes: > >> So it appears that adding a file _does_ tell git that the conflict is >> resolved. > > Yes it does. Git _knows_ that you consider the conflict to be resolved. > It cannot know how happy you are with the result. > > Similarly, in a conflicted merge, the last "git add" does not trigger a > commit silently. And a silent commit would be much less serious than a > silent data drop. Ok, I see your point now. So a message "merge complete; you can drop the stash" would be the most git should do. -- -- Stephe