Re: VC mode and git

[Eli Zaretskii]

> From: Robert Pluim <address@hidden>
> Date: Wed, 01 Apr 2015 17:25:02 +0200
> 
> Eli Zaretskii <address@hidden> 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?