From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ingo Lohmar Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 14:18:41 +0200 Message-ID: <87egamevha.fsf@acer.localhost.com> References: <56FE1882.9030904@cs.ucla.edu> <20160403120300.GB3537@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459685948 3127 80.91.229.3 (3 Apr 2016 12:19:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 12:19:08 +0000 (UTC) Cc: Kaushal Modi , Emacs developers To: Alan Mackenzie , Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 14:19:08 2016 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 1amgzk-0001VA-0I for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 14:19:08 +0200 Original-Received: from localhost ([::1]:53252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgzg-0007zk-0Y for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 08:19:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgzR-0007z6-FG for emacs-devel@gnu.org; Sun, 03 Apr 2016 08:18:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amgzM-00054F-QX for emacs-devel@gnu.org; Sun, 03 Apr 2016 08:18:49 -0400 Original-Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:32912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgzM-00053r-JA for emacs-devel@gnu.org; Sun, 03 Apr 2016 08:18:44 -0400 Original-Received: by mail-lf0-x242.google.com with SMTP id r62so5193995lfd.0 for ; Sun, 03 Apr 2016 05:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version; bh=+uc0WpsPBBMqYPTq7qNNJxXewrgcE8oMSAnJS5ZhV3k=; b=G1T8x+y2048bFJ3vLDU0PKYR8EV0MEl9i0+pnYANi4kkb4ZFOiTRRZYioV+g3qOqYX hPtEfkEBBb5saF1/+PRkXn94jTUxVUL0Te5x9Bob8S6i5zeCLclGAD+dHHefTakSDV+j wa2g4QHvrnP4BI7219BkK2XmmE0eSjC7kaYfAJiiRBCm0usDBxO2ibzI/sglxIoXckcj 7k9+UBE6jHir2MnOP+3lpv029tJgAiojC//vV5tipNXS+UCzgyMNmN3Ho35auNTv8hPs KjpqwSmBM/ncjLQGTi0RHxUlClYDmIGfMs9d/KoZIhSZa3C1RtK1McgAPPwwkpjhN4H0 ZgBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version; bh=+uc0WpsPBBMqYPTq7qNNJxXewrgcE8oMSAnJS5ZhV3k=; b=A/KBhzdme6vX0QS2itEvfwri2yN0nLV/nOJdyAcK0C2ULH4cS4ojzGUVE1Ga1JGc2X BlMxvYcQ6tj+gRmI55tiV88RPlydgeuJHSGzOVmts1J7nk5PWt5zxATe1VOwf6wyHqC8 i8Lk7iy0urhcwce6QyFTwfNJT590/Py7qTCkWk2dZSlQ19unx+xoW63Uv923WSt+QGXW m9QzYAQM0UP3+Aka85+0OX8uoyjOSwbVPqIeZ/teL1y1gxgJ4VMmb9QH5o0zqBnQGffq R03CqtQGy6b5xnk031iLJYhcCDqhEVUupUzH1XDc5xguO+qB/xi/nQgKf2mMlByJ7Fni PYmA== X-Gm-Message-State: AD7BkJJIPmPaolDfETFAJ7fTO/sGL4t7oh29Y3lSilL3pQ7h75fxm88mqEvk800MHkvmZw== X-Received: by 10.194.115.196 with SMTP id jq4mr13390532wjb.101.1459685923694; Sun, 03 Apr 2016 05:18:43 -0700 (PDT) Original-Received: from localhost (xdsl-87-79-226-7.netcologne.de. [87.79.226.7]) by smtp.gmail.com with ESMTPSA id i5sm23483791wja.23.2016.04.03.05.18.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Apr 2016 05:18:42 -0700 (PDT) In-Reply-To: <20160403120300.GB3537@acm.fritz.box> User-Agent: Notmuch/0.20.2+113~g6332e6e (http://notmuchmail.org) Emacs/25.0.90.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::242 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:202619 Archived-At: Hi Alan, On Sun, Apr 03 2016 12:03 (+0000), Alan Mackenzie wrote: > > It was git that prepared the merge, not me. What happened was that the > "more recent" commit 22443312... created a conflict with the commits in > a git pull. git, rather than aborting the pull operation, splurged the > contents of all the other commits in the pull into my working directory, > saying "Conflict in .... You need to merge". I simply merged as > directed. > > Is there a better way out of this situation than just merging as > directed? Can one somehow get out of this partially completed git pull, > then redo it with --rebase? I am not Paul, but feel competent to answer this. You can 'git merge --abort' to return to the previous state. Then you can 'git rebase ', and might be sth like 'origin/master'. But you can avoid all this trouble by not doing 'git pull' in the first place. Do 'git fetch --all', and then have a look at 'git log --graph' as Dmitry suggested (gitk may or may not come with the git package you use, but the information is essentially the same). Hope this helps, Ingo