[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Making git as easy as CVS, for handling merge conflicts
From: |
Eli Zaretskii |
Subject: |
Re: Making git as easy as CVS, for handling merge conflicts |
Date: |
Tue, 12 Nov 2019 07:16:27 +0000 |
User-agent: |
K-9 Mail for Android |
On November 12, 2019 3:18:10 AM GMT, Richard Stallman <address@hidden> wrote:
> [[[ 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. ]]]
>
> > > 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?
>
> > Ediff has multiple entry points and explaining what Ediff does and
> its
> > basic concepts on each of those commands would be quite redundant,
> IMHO.
>
> With a little imagination, it is surely possible to solve the problem
> without much repetition. Would someone like to try?
Ediff has its own Info manual. Isn't that enough to document the feature?
- Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/10
- Re: Making git as easy as CVS, for handling merge conflicts, Óscar Fuentes, 2019/11/10
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/11
- Re: Making git as easy as CVS, for handling merge conflicts, martin rudalics, 2019/11/11
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/11
- Re: Making git as easy as CVS, for handling merge conflicts, martin rudalics, 2019/11/12
- Re: Making git as easy as CVS, for handling merge conflicts, Dmitry Alexandrov, 2019/11/16
- Re: Making git as easy as CVS, for handling merge conflicts, martin rudalics, 2019/11/16
Re: Making git as easy as CVS, for handling merge conflicts, Richard Stallman, 2019/11/11
Re: Making git as easy as CVS, for handling merge conflicts, João Távora, 2019/11/11