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: Thu, 02 Apr 2015 18:01:11 +0300 Message-ID: <83ego2r2vc.fsf@gnu.org> 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> <87sicjggj6.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427986910 3536 80.91.229.3 (2 Apr 2015 15:01:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 15:01:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 17:01:41 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 1Ydgcl-0001J4-6C for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 17:01:39 +0200 Original-Received: from localhost ([::1]:58805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydgcf-00022I-7D for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 11:01:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdgcW-00021A-UZ for emacs-devel@gnu.org; Thu, 02 Apr 2015 11:01:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdgcR-0007Ig-QV for emacs-devel@gnu.org; Thu, 02 Apr 2015 11:01:24 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:33275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdgcR-0007IT-I1 for emacs-devel@gnu.org; Thu, 02 Apr 2015 11:01:19 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NM600L00PEJEI00@mtaout29.012.net.il> for emacs-devel@gnu.org; Thu, 02 Apr 2015 17:58:42 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM600DSDPLU9Z80@mtaout29.012.net.il> for emacs-devel@gnu.org; Thu, 02 Apr 2015 17:58:42 +0300 (IDT) In-reply-to: <87sicjggj6.fsf@gmail.com> 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.185 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:184785 Archived-At: > From: Robert Pluim > Date: Thu, 02 Apr 2015 09:01:33 +0200 > > >> 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. I think you are supposed to commit the entire changeset, after all the conflicts are resolved. Maybe it's worth a bug report against VC.