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: Re: Stupid git! Date: Mon, 14 Sep 2015 10:49:15 +0000 Message-ID: <20150914104914.GB3208@acm.fritz.box> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> <83613ebypk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442227703 30657 80.91.229.3 (14 Sep 2015 10:48:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 10:48:23 +0000 (UTC) Cc: emacs-devel@gnu.org, gscrivano@gnu.org, dgutov@yandex.ru To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 12:48:11 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 1ZbRIx-00029l-3t for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 12:48:11 +0200 Original-Received: from localhost ([::1]:39720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbRIw-0003jL-M7 for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 06:48:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbRIr-0003ig-F4 for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:48:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbRIo-0000or-9v for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:48:05 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:64604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbRIn-0000ob-Up for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:48:02 -0400 Original-Received: (qmail 82110 invoked by uid 3782); 14 Sep 2015 10:48:00 -0000 Original-Received: from acm.muc.de (p579E9E99.dip0.t-ipconnect.de [87.158.158.153]) by colin.muc.de (tmda-ofmipd) with ESMTP; Mon, 14 Sep 2015 12:47:59 +0200 Original-Received: (qmail 3562 invoked by uid 1000); 14 Sep 2015 10:49:15 -0000 Content-Disposition: inline In-Reply-To: <83613ebypk.fsf@gnu.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.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:189932 Archived-At: Hello, Eli. On Sun, Sep 13, 2015 at 09:49:43AM +0300, Eli Zaretskii wrote: > > Date: Sat, 12 Sep 2015 21:51:14 +0000 > > Cc: Eli Zaretskii , gscrivano@gnu.org, emacs-devel@gnu.org > > From: Alan Mackenzie [ .... ] > > > If you're in the middle of a merge, it's a recipe for disaster. > > :-). OK, but the immediate problem is that _I_ didn't modify > > file-notify-tests.el. Somebody else did, and git put his changes into > > my working directory and `git add'ed it. > That's what happens when there are merge conflicts: Git suspends the > merge in its middle. Yes. I had misunderstood "conflict". I had thought it meant a merge conflict in some file, whereas it just meant that other, possibly unrelated, changes had taken place. > > I don't have the log entry for this change. So am I supposed to > > just commit this, with my own log entry? Acutally, I did have this log entry, but `git log' didn't display it. It needed `git log --all' to see it. > Commit everything in one go, with "git commit", and give it a single > log entry, something like "resolve merge conflicts". Thanks, I've done this. > > I don't really understand what "you are still merging" is supposed to > > mean. How do I get out of the "merging" state cleanly, without > > commiting somebody else's changes? > You _must_ commit. A successful merge in Git always ends in a commit, > and in this case you need to do it manually, because the automatic > merge failed due to diverging. OK. I suppose there's a good reason for git aborting the merge rather than completing it in the obvious manner, but I can't see it at the moment. -- Alan Mackenzie (Nuremberg, Germany).