|
| From: | Ian Kelling |
| Subject: | Re: Making git as easy as CVS, for handling merge conflicts |
| Date: | Wed, 30 Oct 2019 11:40:32 -0400 |
| User-agent: | mu4e 1.1.0; emacs 27.0.50 |
Richard Stallman <address@hidden> writes: > 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 will try to do some research this weekend if no one finds an answer first. What front-ends do you use for CVS? I'm assuming emacs vcs mode and the command line? -- Ian Kelling | Senior Systems Administrator, Free Software Foundation GPG Key: B125 F60B 7B28 7FF6 A2B7 DF8F 170A F0E2 9542 95DF https://fsf.org | https://gnu.org
| [Prev in Thread] | Current Thread | [Next in Thread] |