On Mon, 28 Oct 2019 at 00:12, Taylan Kammer <taylan.kam...@gmail.com> wrote: > > 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
"Very nice" is perhaps an understatement; I'd call it superb ;-) It's also GPL v3. I strongly recommend any emacs user who switches to git to try it, as the learning curve is very gentle and the gains in efficiency are huge. > and aides with merging as well. > > https://magit.vc/manual/magit/Resolving-Conflicts.html Right. It also integrates nicely with Ediff: https://magit.vc/manual/magit/Ediffing.html#Ediffing and I believe that since emacs 26.1 it should be possible to do 3-way merges with ancestor, although I have not tried this yet: https://stackoverflow.com/questions/15587595/can-ediff-merge-simultaneously-show-the-ancestor-a-b-and-merge-buffers
