[Top][All Lists]

[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)

reply via email to

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