From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Wed, 08 Apr 2015 14:20:28 -0400 Message-ID: References: <86sice77h0.fsf@dod.no> <83iod9lnp0.fsf@gnu.org> <83a8yjj348.fsf@gnu.org> <878ue3g1j7.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428517273 4330 80.91.229.3 (8 Apr 2015 18:21:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 18:21:13 +0000 (UTC) Cc: eliz@gnu.org, sb@dod.no, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 08 20:21:07 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yfub3-0008TK-JP for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 20:21:05 +0200 Original-Received: from localhost ([::1]:54263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfub2-0007m6-MI for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 14:21:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfuaW-0007ha-BN for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:20:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfuaV-0006ro-FU for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:20:32 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfuaV-0006re-5K for emacs-devel@gnu.org; Wed, 08 Apr 2015 14:20:31 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YfuaS-00077W-M2; Wed, 08 Apr 2015 14:20:29 -0400 In-reply-to: <878ue3g1j7.fsf@uwakimon.sk.tsukuba.ac.jp> (stephen@xemacs.org) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185162 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > If the conflict is between the incoming branch and uncommitted changes > in the workspace, the requested merge fails git's preconditions and > does not even start. No files in the workspace are touched, no commit > objects are created, and the HEAD pointer is not moved. > Some people (who I believe are not native speakers) have called both > non-success modes "failure". Both of them are failures, because in both cases the pull doesn't do its intended job of bringing in the latest changes so you can commit something correct. I will not let the Git developers redefine one of these failure modes as a kind of success. I will continue to refer to them both as failures. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.