From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 14:10:57 +0200 Organization: Linux Private Site Message-ID: <8760vy6gfi.fsf@Rainer.invalid> 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 1459685495 28577 80.91.229.3 (3 Apr 2016 12:11:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 12:11:35 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 14:11:25 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 1amgsG-0006sK-U1 for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 14:11:25 +0200 Original-Received: from localhost ([::1]:53219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgsG-0004cI-5d for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 08:11:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgs1-0004c9-1q for emacs-devel@gnu.org; Sun, 03 Apr 2016 08:11:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amgrx-0003GX-QB for emacs-devel@gnu.org; Sun, 03 Apr 2016 08:11:08 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:54892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgrx-0003GS-Jq for emacs-devel@gnu.org; Sun, 03 Apr 2016 08:11:05 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1amgru-0006jf-SW for emacs-devel@gnu.org; Sun, 03 Apr 2016 14:11:02 +0200 Original-Received: from p54b46f42.dip0.t-ipconnect.de ([84.180.111.66]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Apr 2016 14:11:02 +0200 Original-Received: from Stromeko by p54b46f42.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Apr 2016 14:11:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 50 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: p54b46f42.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) Cancel-Lock: sha1:V+krq574dDR99VLIdEhYuxJWm8k= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.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:202617 Archived-At: Alan Mackenzie writes: > It was git that prepared the merge, not me. Blaming the tools? > 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. Nope, you were supposed to either abort the merge or fix the conflict(s) and then stage the resulting changes and "git commit" them. See "git help merge", section "How to resolve conflicts". > 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? git merge --abort >> Understanding what happened is somewhat complicated by the more-recent commit >> 22443312188ff097b69d9ff4b87c2b4f7bbbc263, which finished fixing the cc-mode >> patch and undid some of the effect of the incomplete fix. > > This was what created the conflict, I think. And that was the only conflict markers that should have been edited. It seems you really did another manual "git merge" with the arguments in the wrong order instead. >> You can see all this more easily by running the shell command "gitk" in a >> directory containing a checked-out copy of the emacs-25 branch. > > I haven't got gitk. Is it supposed to be part of the main git > distribution? Yes, although some distributions have it in a separate package since it requires Tk. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf microQ V2.22R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada