Re: Making git as easy as CVS, for handling merge conflicts

[Eli Zaretskii]

> From: Adam Spiers <address@hidden>
> Date: Wed, 6 Nov 2019 10:24:09 +0000
> Cc: Dmitry Alexandrov <address@hidden>, address@hidden
> 
> A wild guess, based on previous conversation in this thread, is that
> maybe you resolved the conflict in emacs but didn't stage the
> resolution before attempting to commit it.

No, that is unlikely to be the reason, because when you save your
edits in files that had merge conflict markers, and the VC backend is
Git, Emacs automatically stages each such file as you save it.

P.S. Please CC me on any replies, as I'm not subscribed to this list.