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: VC mode and git Date: Wed, 01 Apr 2015 18:58:23 +0300 Message-ID: <83wq1vrgbk.fsf@gnu.org> References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427903930 7629 80.91.229.3 (1 Apr 2015 15:58:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 15:58:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 17:58:44 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 1YdL2P-0005zF-BQ for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 17:58:41 +0200 Original-Received: from localhost ([::1]:53601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdL2O-0005IZ-Qe for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 11:58:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdL2L-0005IP-L1 for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:58:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdL2H-0000ly-KQ for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:58:37 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:41827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdL2H-0000lc-C5 for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:58:33 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NM400L00XIBOB00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:58:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400LIUXPJM860@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:58:31 +0300 (IDT) In-reply-to: <87y4mbhnw1.fsf@gmail.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:184736 Archived-At: > From: Robert Pluim > Date: Wed, 01 Apr 2015 17:25:02 +0200 > > Eli Zaretskii writes: > > > Once you fix all the conflicts, invoke "git commit" to complete the > > merge (which "git pull" normally does automatically, but didn't do due > > to the conflicts). After that, you should "git push" to update the > > repository on Savannah with your local commits. > > Just out of curiosity: what is supposed to be the way to perform that > commit from inside Emacs? vc-next-action on a file where I've resolved > the conflicts gets me: > > fatal: cannot do a partial commit during a merge. Doesn't "git commit" work from the shell prompt?