emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Richard Stallman
Subject: Re: Making git as easy as CVS, for handling merge conflicts
Date: Sun, 10 Nov 2019 22:03:53 -0500

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

Talking about my problems using git via Emacs and VC.  When I tried
this, a few years ago, something gave me three side-by-side windows
and I had no idea what to do with them, so I had to bail out.

  > Maybe, it was ediff-mode?

What does Ediff mode do?  Does it make three windows
side by side?

I looked at the doc strings of ediff-mode and ediff.  They give a few
secondary details but they don't even start to answer the questions,
"What is this good for?  What does it do?"  So I can't tell whether it
would make three windows.

Regardless of my git issues, those doc strings ought to be improved.
Would someone like to do it?

-- 
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]