From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Mon, 14 Sep 2015 15:22:19 +0300 Message-ID: <83bnd59on8.fsf@gnu.org> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> <55F5DC69.1040104@yandex.ru> <20150914110920.GC3208@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442233378 25323 80.91.229.3 (14 Sep 2015 12:22:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 12:22:58 +0000 (UTC) Cc: emacs-devel@gnu.org, gscrivano@gnu.org, dgutov@yandex.ru To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 14:22:46 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 1ZbSmQ-0002W5-Rl for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 14:22:42 +0200 Original-Received: from localhost ([::1]:40363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbSmQ-0001dh-Er for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 08:22:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbSmH-0001UV-9L for emacs-devel@gnu.org; Mon, 14 Sep 2015 08:22:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbSmC-0004yq-Do for emacs-devel@gnu.org; Mon, 14 Sep 2015 08:22:33 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:48213) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbSmC-0004yd-6N; Mon, 14 Sep 2015 08:22:28 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NUO00K0025HYO00@a-mtaout22.012.net.il>; Mon, 14 Sep 2015 15:22:21 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUO00KD92D8Y410@a-mtaout22.012.net.il>; Mon, 14 Sep 2015 15:22:21 +0300 (IDT) In-reply-to: <20150914110920.GC3208@acm.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:189936 Archived-At: > Date: Mon, 14 Sep 2015 11:09:20 +0000 > Cc: Eli Zaretskii , gscrivano@gnu.org, emacs-devel@gnu.org > From: Alan Mackenzie > > > The merge commit is *supposed to* include all the changes that have been > > merged in. If you take it upon yourself to remove those changes from the > > staging area, as a result Emacs won't include them, and it won't be > > obvious to most of the people who read emacs-diffs, and then someone > > will have to find out the hard way that something's missing. > > OK, I've got it now. For some reason, git choses to abort the merge, > despite there being no conflicts between the changes from upstream and > the changes I've committed locally - indeed, to complete the merge is a > fully mechanical action, `git commit'. This seeming illogicality is > what confused me in the first place. I think this was because you did a "git add" before pulling. But I'm not sure. (I almost never use "git add", except when adding new files.)