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: Stupid git! Date: Sun, 13 Sep 2015 09:49:43 +0300 Message-ID: <83613ebypk.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442127005 24242 80.91.229.3 (13 Sep 2015 06:50:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Sep 2015 06:50:05 +0000 (UTC) Cc: emacs-devel@gnu.org, gscrivano@gnu.org, dgutov@yandex.ru To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 13 08:49:57 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 1Zb16o-0006Oc-VJ for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 08:49:55 +0200 Original-Received: from localhost ([::1]:34725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb16o-0007nS-E1 for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 02:49:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb16l-0007ll-7L for emacs-devel@gnu.org; Sun, 13 Sep 2015 02:49:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zb16i-0006S4-0l for emacs-devel@gnu.org; Sun, 13 Sep 2015 02:49:51 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:39522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb16h-0006Qb-Pa; Sun, 13 Sep 2015 02:49:47 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NUL00200S4N1H00@mtaout25.012.net.il>; Sun, 13 Sep 2015 09:46:36 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUL00JZFS5O5S70@mtaout25.012.net.il>; Sun, 13 Sep 2015 09:46:36 +0300 (IDT) In-reply-to: <20150912215114.GB3711@acm.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:189884 Archived-At: > Date: Sat, 12 Sep 2015 21:51:14 +0000 > Cc: Eli Zaretskii , gscrivano@gnu.org, emacs-devel@gnu.org > From: Alan Mackenzie > > > 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. That's what happens when there are merge conflicts: Git suspends the merge in its middle. > I don't have the log entry for this change. So am I supposed to > just commit this, with my own log entry? Commit everything in one go, with "git commit", and give it a single log entry, something like "resolve merge conflicts". > 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.