[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git

From: Robert Pluim
Subject: Re: VC mode and git
Date: Thu, 02 Apr 2015 17:38:16 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

>> From: Robert Pluim <address@hidden>
>> 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.

Well, my changeset in this case consisted of exactly one file :)

I guess using vc-dir to commit might do it, but I think I'll just stick
to using magit.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]