From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 18:12:11 +0300 Message-ID: <8360vyrak4.fsf@gnu.org> References: <20160403111708.GA3537@acm.fritz.box> <87lh4uex9h.fsf@acer.localhost.com> <20160403121458.GC3537@acm.fritz.box> <87bn5qeuxo.fsf@acer.localhost.com> <87mvpazsqo.fsf@linux-m68k.org> <878u0ueo3x.fsf@acer.localhost.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1459696402 22794 80.91.229.3 (3 Apr 2016 15:13:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 15:13:22 +0000 (UTC) Cc: acm@muc.de, emacs-devel@gnu.org, schwab@linux-m68k.org, kaushal.modi@gmail.com To: Ingo Lohmar Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 17:12:58 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 1amjhy-0007eS-FX for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 17:12:58 +0200 Original-Received: from localhost ([::1]:53844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjhx-0002OJ-Jl for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 11:12:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjhj-0002O2-Aq for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:12:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amjhg-0004Tg-2D for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:12:43 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjhf-0004Tb-Uf; Sun, 03 Apr 2016 11:12:39 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3097 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1amjhe-0004sD-RG; Sun, 03 Apr 2016 11:12:39 -0400 In-reply-to: <878u0ueo3x.fsf@acer.localhost.com> (message from Ingo Lohmar on Sun, 03 Apr 2016 16:57:54 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:202631 Archived-At: > From: Ingo Lohmar > Date: Sun, 03 Apr 2016 16:57:54 +0200 > Cc: Alan Mackenzie , Kaushal Modi , > Emacs developers > > > git merge will not allow overwriting uncommited changes anyway. > > > > Andreas. > > That's correct, but if the changes are in files unaffected by the merge, > git *does* start the merge. But it will be hard to return to the exact > pre-merge state if you want to abort. Git stops the merge at the point where it's quite easy to abort or stash the uncommitted changes. When Git stops, it displays a message with these 2 alternatives; following either alternative is easy and safe.