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: git pull fails with merge conflicts. How can this possibly happen? Date: Fri, 14 Nov 2014 18:37:37 +0000 Message-ID: <20141114183737.GB3168@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1415990332 31857 80.91.229.3 (14 Nov 2014 18:38:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 18:38:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 19:38:46 2014 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 1XpLlZ-0000aP-RJ for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 19:38:41 +0100 Original-Received: from localhost ([::1]:37545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpLlZ-000897-Gs for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 13:38:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpLlE-000889-Sf for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:38:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpLl8-0000wL-RW for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:38:20 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:59069 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpLl8-0000vD-G4 for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:38:14 -0500 Original-Received: (qmail 34584 invoked by uid 3782); 14 Nov 2014 18:38:12 -0000 Original-Received: from acm.muc.de (pD95186C8.dip0.t-ipconnect.de [217.81.134.200]) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 14 Nov 2014 19:38:11 +0100 Original-Received: (qmail 4315 invoked by uid 1000); 14 Nov 2014 18:37:37 -0000 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:177102 Archived-At: Hello, Emacs. I've now advanced from my last puzzlement. It turns out that "git clone" doesn't properly initialise the new repository. I had to do this manually with "git checkout emacs-24". I now get a bit further with "git pull" from my other repository. This "git pull" leaves a mass of merge conflicts. How can this be? I have not edited a single file in any git repository as of yet. Here is a screen shot from this "git pull" together with a preceeding "git branch -a": acm@acm ~/emacs/emacs.git/emacs-24 $ git branch -a * emacs-24 master remotes/origin/HEAD -> origin/master remotes/origin/emacs-24 remotes/origin/master acm@acm ~/emacs/emacs.git/emacs-24 $ git pull remote: Counting objects: 32, done. remote: Compressing objects: 100% (16/16), done. remote: Total 32 (delta 26), reused 22 (delta 16) Unpacking objects: 100% (32/32), done. From /home/acm/emacs/emacs.git/master/. + 911ad4a...6688117 emacs-24 -> origin/emacs-24 (forced update) Auto-merging src/nsfns.m Auto-merging src/ChangeLog CONFLICT (content): Merge conflict in src/ChangeLog Auto-merging lisp/gnus/ChangeLog CONFLICT (content): Merge conflict in lisp/gnus/ChangeLog Auto-merging etc/ChangeLog CONFLICT (content): Merge conflict in etc/ChangeLog Auto-merging etc/CONTRIBUTE Auto-merging admin/ChangeLog CONFLICT (content): Merge conflict in admin/ChangeLog Auto-merging Makefile.in CONFLICT (content): Merge conflict in Makefile.in Auto-merging ChangeLog CONFLICT (content): Merge conflict in ChangeLog Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Automatic merge failed; fix conflicts and then commit the result. What does git pull actually do? The git pull man page says: "Incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD." Does this mean that git has tried to merge changes on the master branch into my emacs-24 branch working directory? Surely git can't be that stupid. Please? -- Alan Mackenzie (Nuremberg, Germany).