[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:15:26 +0000 |
User-agent: |
K-9 Mail for Android |
On November 12, 2019 3:15:49 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 think that ediff3, or ediff-files3, is an Emacs interface to the
> diff3
> > algorithm, which I know does the same for three versions, but,
> > perhaps much like you, it confuses me a lot. Some people do
> > prefer to handle merge conflicts with it.
>
> If so, why did a VC command invoke this automatically
> without my requesting it?
It doesn't do that by itself. One has to invoke a command to cause that.
Maybe you pressed the corresponding key sequence by accident (assuming it was
Ediff that popped up those windows, which at this point is just a hypothesis)?
- Re: Making git as easy as CVS, for handling merge conflicts, (continued)
- 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
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,
Eli Zaretskii <=