From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sun, 13 Sep 2015 23:28:25 +0300 Message-ID: <55F5DC69.1040104@yandex.ru> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1442176145 12737 80.91.229.3 (13 Sep 2015 20:29:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Sep 2015 20:29:05 +0000 (UTC) Cc: Eli Zaretskii , gscrivano@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 13 22:29:00 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 1ZbDtS-00047H-Fy for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 22:28:58 +0200 Original-Received: from localhost ([::1]:37040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbDtR-00081n-OS for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 16:28:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbDtF-00081h-Oo for emacs-devel@gnu.org; Sun, 13 Sep 2015 16:28:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbDtC-0000wO-JF for emacs-devel@gnu.org; Sun, 13 Sep 2015 16:28:45 -0400 Original-Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:36740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbDtC-0000wD-BC; Sun, 13 Sep 2015 16:28:42 -0400 Original-Received: by lanb10 with SMTP id b10so75199636lan.3; Sun, 13 Sep 2015 13:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=AXnO0baLVBLLjrBxUqWLYUD4HIP62CjlzkKDqRyv3W8=; b=tjF8mTsRAr90mVdSn2elbeZi+x8Z1ulDigVL5iExW+393kFN4cjkvu6iLpjnzgrvAw C2t1XirvwzFwGobUX0UFz+tENSNxM9FntssR0LitWx0QVim0Z4mja336RG6PWvzJY+tn z2pul5CQiHe+SLZ3cLGD2KgLJfJgjnFsN/SiV54qv/SSAm0BkcKO5qaFz7tGodcORfHA fDxc6poAEcGX8jM5fd6NmyPhAtPpR/9EfE6UMNQDBtFjsDfpwAo9dvSit/uPGE9teLC6 L5dR19dfyjk1ZvbTqB83B9V63yFdgXyS9tScssqr42bkk8QT/bwEj19ZoPw2dfGztS+U 95sA== X-Received: by 10.152.28.65 with SMTP id z1mr10142518lag.9.1442176120734; Sun, 13 Sep 2015 13:28:40 -0700 (PDT) Original-Received: from [192.168.1.190] ([178.252.127.222]) by smtp.googlemail.com with ESMTPSA id og8sm1744757lbc.5.2015.09.13.13.28.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Sep 2015 13:28:39 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:41.0) Gecko/20100101 Thunderbird/41.0 In-Reply-To: <20150912215114.GB3711@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22b 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:189905 Archived-At: On 09/13/2015 12:51 AM, Alan Mackenzie wrote: > On branch master > Your branch and 'origin/master' have diverged, > and have 1 and 1 different commit each, respectively. > (use "git pull" to merge the remote branch into yours) > All conflicts fixed but you are still merging. > (use "git commit" to conclude merge) I think what Git says here is pretty transparent: commit to conclude the merge. > :-). 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. Yes, it did. Have you done any non-trivial merges before? That's how they usually look. The merge commit shouldn't, generally, include any non-mergy changes, so you're not expected to stage any of the files you've been working on, before committing. > I don't have the log entry for > this change. So am I supposed to just commit this, with my own log > entry? The log entry should describe the merge (you could leave the default message there, unless it's necessary to add more info). > 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? The merge commit is *supposed to* include all the changes that have been merged in. If you take it upon yourself to remove those changes from the staging area, as a result Emacs won't include them, and it won't be obvious to most of the people who read emacs-diffs, and then someone will have to find out the hard way that something's missing.