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: Sat, 12 Sep 2015 21:51:14 +0000 Message-ID: <20150912215114.GB3711@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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442094624 17144 80.91.229.3 (12 Sep 2015 21:50:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 21:50:24 +0000 (UTC) Cc: Eli Zaretskii , gscrivano@gnu.org, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 23:50:14 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 1ZasgW-0007Rf-CS for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 23:50:12 +0200 Original-Received: from localhost ([::1]:33818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZasgV-00062v-FV for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 17:50:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZasgS-00061k-Lk for emacs-devel@gnu.org; Sat, 12 Sep 2015 17:50:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZasgN-0003vF-Lj for emacs-devel@gnu.org; Sat, 12 Sep 2015 17:50:08 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:13362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZasgN-0003sK-A2 for emacs-devel@gnu.org; Sat, 12 Sep 2015 17:50:03 -0400 Original-Received: (qmail 10368 invoked by uid 3782); 12 Sep 2015 21:50:02 -0000 Original-Received: from acm.muc.de (p548A4594.dip0.t-ipconnect.de [84.138.69.148]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 12 Sep 2015 23:50:00 +0200 Original-Received: (qmail 4105 invoked by uid 1000); 12 Sep 2015 21:51:14 -0000 Content-Disposition: inline In-Reply-To: <55F48E7F.40602@yandex.ru> 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:189879 Archived-At: Hello, Dmitry. On Sat, Sep 12, 2015 at 11:43:43PM +0300, Dmitry Gutov wrote: > On 09/12/2015 11:36 PM, Alan Mackenzie wrote: > > I just did `git pull'. This didn't merge the upstream changes into > > my repository. Instead it put the upstream file change into my working > > directory, discarding the other contributer's change log. If I > > understand correctly, that is. > What does 'git status' say? 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) Changes to be committed: modified: test/automated/file-notify-tests.el Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: .gitignore modified: lisp/textmodes/paragraphs.el modified: src/search.c > > I think the best thing for me to do now is `git checkout ' to > > revert that changed file, > 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. I don't have the log entry for this change. So am I supposed to just commit this, with my own log entry? 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? -- Alan Mackenzie (Nuremberg, Germany).