From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Thu, 02 Apr 2015 09:01:33 +0200 Organization: not if I can help it Message-ID: <87sicjggj6.fsf@gmail.com> References: <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> <83wq1vrgbk.fsf@gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427958125 18313 80.91.229.3 (2 Apr 2015 07:02:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 07:02:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 09:01: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 1YdZ8W-0005Gu-Ng for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 09:01:56 +0200 Original-Received: from localhost ([::1]:56174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdZ8W-0001gh-1C for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 03:01:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdZ8Q-0001at-BO for emacs-devel@gnu.org; Thu, 02 Apr 2015 03:01:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdZ8L-00014P-Cv for emacs-devel@gnu.org; Thu, 02 Apr 2015 03:01:50 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:56321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdZ8L-00014L-6p for emacs-devel@gnu.org; Thu, 02 Apr 2015 03:01:45 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YdZ8I-00056L-Be for emacs-devel@gnu.org; Thu, 02 Apr 2015 09:01:42 +0200 Original-Received: from 213.30.189.66 ([213.30.189.66]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 02 Apr 2015 09:01:42 +0200 Original-Received: from rpluim by 213.30.189.66 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 02 Apr 2015 09:01:42 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 213.30.189.66 Mail-Copies-To: never User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:9xl/TU49QTC8TOgJeGIx6W741lA= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.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:184769 Archived-At: Eli Zaretskii writes: >> 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? Of course it does, but that's not the point. When you've done 'git pull' and gotten conflicts, git won't let you do a commit that specifies a filename since you're in the middle of a merge, and vc apparently doesn't handle that case. Robert