From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sat, 12 Sep 2015 13:02:55 +0000 Message-ID: <20150912130255.GF2322@acm.fritz.box> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442062927 22896 80.91.229.3 (12 Sep 2015 13:02:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 13:02:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Giuseppe Scrivano Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 15:01:58 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 1ZakRK-0006ne-7W for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 15:01:58 +0200 Original-Received: from localhost ([::1]:60763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZakRJ-0000kj-P7 for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 09:01:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZakR8-0000iL-0l for emacs-devel@gnu.org; Sat, 12 Sep 2015 09:01:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZakR4-0007ZT-Qw for emacs-devel@gnu.org; Sat, 12 Sep 2015 09:01:45 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:36755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZakR4-0007ZK-HG for emacs-devel@gnu.org; Sat, 12 Sep 2015 09:01:42 -0400 Original-Received: (qmail 98799 invoked by uid 3782); 12 Sep 2015 13:01:41 -0000 Original-Received: from acm.muc.de (p548A4594.dip0.t-ipconnect.de [84.138.69.148]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 12 Sep 2015 15:01:41 +0200 Original-Received: (qmail 14074 invoked by uid 1000); 12 Sep 2015 13:02:55 -0000 Content-Disposition: inline In-Reply-To: <877fnvn9nh.fsf@foo.bar.baz> User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.3 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:189865 Archived-At: Hello, Giuseppe. On Sat, Sep 12, 2015 at 01:45:38PM +0200, Giuseppe Scrivano wrote: > Alan Mackenzie writes: > > Hello, Emacs. > > > > git has struck again, and another couple of hours valuable time have > > been lost. > > > > Having "staged" a change with `git add', I then tried to commit it with > > `git commit'. Somebody else had got in before me, so I had to pull > > their changes first - fair enough. > > > > So I did `git pull'. I was then dumped into an editing session for a > > merge operation for .../test/automated/file-notify-tests.el. Eh? I've > > never touched this file in my life, and didn't even know it existed. So > > why is a merge necessary/why has a merge been (half-)done? Why didn't > > git pull simply merge the changes to this file into my repository and > > working directory? > are you working and pulling on the same branch? Yes. > Have you used --rebase to pull to apply your commits after you pulled > all the changes from the remote repository? No, I didn't. I should have done. I don't think there are any disadvantages to doing so. > Regards, > Giuseppe -- Alan Mackenzie (Nuremberg, Germany).