From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giuseppe Scrivano Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sat, 12 Sep 2015 13:45:38 +0200 Message-ID: <877fnvn9nh.fsf@foo.bar.baz> References: <20150912101514.GA2322@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442058355 23691 80.91.229.3 (12 Sep 2015 11:45:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 11:45:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 13:45:51 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 1ZajFd-0003HK-SU for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 13:45:50 +0200 Original-Received: from localhost ([::1]:60357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZajFc-0002L0-Fi for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 07:45:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZajFZ-0002HT-9R for emacs-devel@gnu.org; Sat, 12 Sep 2015 07:45:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZajFW-0000wN-2x for emacs-devel@gnu.org; Sat, 12 Sep 2015 07:45:45 -0400 Original-Received: from mx1.redhat.com ([209.132.183.28]:60387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZajFV-0000wE-P4 for emacs-devel@gnu.org; Sat, 12 Sep 2015 07:45:42 -0400 Original-Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 3A993C0B2014; Sat, 12 Sep 2015 11:45:41 +0000 (UTC) Original-Received: from foo.bar.baz (vpn1-4-183.ams2.redhat.com [10.36.4.183]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8CBjcVA008267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 12 Sep 2015 07:45:40 -0400 In-Reply-To: <20150912101514.GA2322@acm.fritz.box> (Alan Mackenzie's message of "Sat, 12 Sep 2015 10:15:14 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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:189860 Archived-At: 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? Have you used --rebase to pull to apply your commits after you pulled all the changes from the remote repository? Regards, Giuseppe