Re: VC mode and git

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Cc: address@hidden,
>     address@hidden,
>     address@hidden,
>     address@hidden
> Date: Mon, 06 Apr 2015 03:45:32 +0900
> 
> Unfortunately, there's the case that hasn't been mentioned explicitly,
> which is where he has a code change that touches multiple files, some
> of which are conflicted and some of which are not.  The conflicted
> files have to be committed to keep git happy unless you do some
> "advanced" stuff, such as stash.  I don't think you really want
> Richard's changes mixed with merge changes.

Yes, in that case all the uncommitted changes belonging to the same
changeset as the conflicted changes will have to be committed as well.