all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Avoiding the three-windows merging with Git
@ 2019-11-25  3:14 Richard Stallman
  2019-11-25  3:32 ` Eli Zaretskii
  0 siblings, 1 reply; 11+ messages in thread
From: Richard Stallman @ 2019-11-25  3:14 UTC (permalink / raw)
  To: emacs-devel

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





^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2019-11-28  4:17 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-25  3:14 Avoiding the three-windows merging with Git Richard Stallman
2019-11-25  3:32 ` Eli Zaretskii
2019-11-26  3:46   ` Richard Stallman
2019-11-26  7:16     ` Kévin Le Gouguec
2019-11-27  6:45       ` Richard Stallman
2019-11-27  9:39         ` Marcin Borkowski
2019-11-27 20:15           ` Kévin Le Gouguec
2019-11-27 22:48             ` Marcin Borkowski
2019-11-28  4:17           ` Richard Stallman
2019-11-27 15:45         ` Eli Zaretskii
2019-11-27 19:45           ` Kévin Le Gouguec

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.