From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Avoiding the three-windows merging with Git Date: Mon, 25 Nov 2019 05:32:07 +0200 Message-ID: <83sgmcskaw.fsf@gnu.org> References: Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="232435"; mail-complaints-to="usenet@blaine.gmane.org" Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 25 04:32:42 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 1iZ57B-000yGx-FJ for ged-emacs-devel@m.gmane.org; Mon, 25 Nov 2019 04:32:41 +0100 Original-Received: from localhost ([::1]:39972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ579-0006KB-Ml for ged-emacs-devel@m.gmane.org; Sun, 24 Nov 2019 22:32:39 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51032) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ56i-0006K5-3K for emacs-devel@gnu.org; Sun, 24 Nov 2019 22:32:13 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:58503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZ56h-00039J-W6 for emacs-devel@gnu.org; Sun, 24 Nov 2019 22:32:12 -0500 Original-Received: from [176.228.60.248] (port=3794 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZ56a-00050T-HP; Sun, 24 Nov 2019 22:32:04 -0500 In-reply-to: (message from Richard Stallman on Sun, 24 Nov 2019 22:14:27 -0500) 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:242699 Archived-At: > From: Richard Stallman > Date: Sun, 24 Nov 2019 22:14:27 -0500 > > 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 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. I suggest that you try, and if something goes wrong, describe what you see, and the output of "C-h l" at that point.