Re: VC mode and git

[Eli Zaretskii]

> Date: Wed, 01 Apr 2015 06:22:19 -0400
> From: Richard Stallman <address@hidden>
> CC: address@hidden, address@hidden, address@hidden
> 
> With CVS, it would indicate the conflicts in those files,
> and I only had to edit them to resolve the conflicts.
> I do that by hand, since that way I know exactly what's going on
> and I can do them in any order.

You can do (almost) the same with Git, see my other message.

> It seems that git handles this much worse.

If you follow the procedure I suggested, I think you will find that
Git handles this almost the same.  That's why I suggested it, and not
the alternatives.