From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Avoiding the three-windows merging with Git Date: Mon, 25 Nov 2019 22:46:47 -0500 Message-ID: References: <83sgmcskaw.fsf@gnu.org> Reply-To: rms@gnu.org Content-Type: text/plain; charset=Utf-8 Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="94490"; mail-complaints-to="usenet@blaine.gmane.org" Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 26 04:54:33 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iZRvq-000OQ4-Ov for ged-emacs-devel@m.gmane.org; Tue, 26 Nov 2019 04:54:30 +0100 Original-Received: from localhost ([::1]:49922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZRvo-0005mE-LY for ged-emacs-devel@m.gmane.org; Mon, 25 Nov 2019 22:54:28 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47227) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZRvg-0005dj-J7 for emacs-devel@gnu.org; Mon, 25 Nov 2019 22:54:22 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:49954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZRoQ-0006v2-38 for emacs-devel@gnu.org; Mon, 25 Nov 2019 22:46:50 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1iZRoN-0000cW-RE; Mon, 25 Nov 2019 22:46:48 -0500 In-Reply-To: <83sgmcskaw.fsf@gnu.org> (message from Eli Zaretskii on Mon, 25 Nov 2019 05:32:07 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:242725 Archived-At: [[[ 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? > No. The only idea was that you somehow inadvertently started Ediff. > That shouldn't be necessary, and doesn't happen automatically, so it's > unclear how it happened, if it did. I never use it, so unless I started it by typo, I don't think I started it. And ISTR it happened more than once. I don't know how to provoke a conflict intentionally. I'd have to ask someone to install a patch that conflicts with something I want to install. However, doing that in a Git repo where it will be impossible to remove later seems like a bad idea. Can someone help me create a conflict to test handling it? -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)