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? > > I don't know how CVS handles merge conflicts
Well, IIRC, the same way git-merge(1) does¹: by creating a file with <<<<<<< ======= >>>>>>> marks. - ¹ Speaking historically, the other way round, of course.
signature.asc
Description: PGP signature
