[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Avoiding the three-windows merging with Git
From: |
Richard Stallman |
Subject: |
Avoiding the three-windows merging with Git |
Date: |
Sun, 24 Nov 2019 22:14:27 -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. ]]]
Has anyone figured out why merge conflicts go into a mode
with three windows, and some way to turn that off
without breaking anything else?
I would really appreciate that help, since with it I could make
another attempt to use Git, and perhaps this time understand how to
cope with the conflicts.
--
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)
- Avoiding the three-windows merging with Git,
Richard Stallman <=
- Re: Avoiding the three-windows merging with Git, Eli Zaretskii, 2019/11/24
- Re: Avoiding the three-windows merging with Git, Richard Stallman, 2019/11/25
- Re: Avoiding the three-windows merging with Git, Kévin Le Gouguec, 2019/11/26
- Re: Re: Avoiding the three-windows merging with Git, Richard Stallman, 2019/11/27
- Re: Avoiding the three-windows merging with Git, Marcin Borkowski, 2019/11/27
- Re: Avoiding the three-windows merging with Git, Kévin Le Gouguec, 2019/11/27
- Re: Avoiding the three-windows merging with Git, Marcin Borkowski, 2019/11/27
- Re: Avoiding the three-windows merging with Git, Richard Stallman, 2019/11/27
- Re: Avoiding the three-windows merging with Git, Eli Zaretskii, 2019/11/27
- Re: Avoiding the three-windows merging with Git, Kévin Le Gouguec, 2019/11/27