On 28.10.2019 00:51, Richard Stallman wrote: > Is it possible to write a front-end for Git which reliably handles > merge conflicts the way CVS handles them? Given that, I expect I > could use Git.
I don't know how CVS handles merge conflicts, but the Emacs extension Magit is a very nice front-end to Git and aides with merging as well. https://magit.vc/manual/magit/Resolving-Conflicts.html - Taylan
