From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sven Axelsson Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sun, 13 Sep 2015 08:22:26 +0200 Message-ID: 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=UTF-8 X-Trace: ger.gmane.org 1442125369 3636 80.91.229.3 (13 Sep 2015 06:22:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Sep 2015 06:22:49 +0000 (UTC) Cc: Eli Zaretskii , emacs , gscrivano@gnu.org, Dmitry Gutov To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 13 08:22:48 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 1Zb0gZ-0002cF-US for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 08:22:48 +0200 Original-Received: from localhost ([::1]:34680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb0gY-0003M9-Lu for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 02:22:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb0gK-0003LG-I0 for emacs-devel@gnu.org; Sun, 13 Sep 2015 02:22:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zb0gJ-00057G-NI for emacs-devel@gnu.org; Sun, 13 Sep 2015 02:22:32 -0400 Original-Received: from mail-vk0-x236.google.com ([2607:f8b0:400c:c05::236]:36718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb0gG-00056W-6A; Sun, 13 Sep 2015 02:22:28 -0400 Original-Received: by vkfp126 with SMTP id p126so43707960vkf.3; Sat, 12 Sep 2015 23:22:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=t5iFAPb8fVaWNhJnsMkH61vlCnyHPSk4LRrIrm6ktpQ=; b=YGR/DRqKCkQtz09/kei5H5Vf177mBGPFMfWzBJ3m5Tux5NwhW66jsvQdtwItpwwCgb 49MH782JwTno7je5r/Xpxp2uIlsroNocBVdd/173949vT1erq4OPKdpXHDRtX4eL1k6t pGZlTIo4NAI90k5A9ashwR9Mh11S76FDMD79+6JibN05uQ66b6iCU9/GBf9Bw1oppXBu sS2S2RjiOlp6tklJolUPdODESSm6XDE5nVPXTC5HyAwvONcbiQbkY9lQpaiFncf8TaiR +/wMwU2cET/jGxqEabD5LrJiwOzXxSRk/p9EDAN4bc5AKq/zUv3BjGzGDGL/iOZ5EGDF xB7g== X-Received: by 10.31.129.131 with SMTP id c125mr6504430vkd.65.1442125347008; Sat, 12 Sep 2015 23:22:27 -0700 (PDT) Original-Received: by 10.31.48.149 with HTTP; Sat, 12 Sep 2015 23:22:26 -0700 (PDT) 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: 2607:f8b0:400c:c05::236 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:189882 Archived-At: On 12 September 2015 at 23:51, Alan Mackenzie wrote: > 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). > `git status` tells you if you are in a merge operation, as you can see from the message above. To back out and undo all changes introduced by the merge, you can use `git merge --abort`. -- Sven Axelsson ++++++++++[>++++++++++>+++++++++++>++++++++++>++++++ >++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<. +++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.