From: Richard Stallman <rms@gnu.org>
To: emacs-devel@gnu.org
Subject: Avoiding the three-windows merging with Git
Date: Sun, 24 Nov 2019 22:14:27 -0500 [thread overview]
Message-ID: <E1iZ4pX-0004rT-Ms@fencepost.gnu.org> (raw)
[[[ 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)
next reply other threads:[~2019-11-25 3:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-25 3:14 Richard Stallman [this message]
2019-11-25 3:32 ` Avoiding the three-windows merging with Git 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1iZ4pX-0004rT-Ms@fencepost.gnu.org \
--to=rms@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.