From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Making git as easy as CVS, for handling merge conflicts Date: Mon, 11 Nov 2019 09:45:44 +0000 Message-ID: References: <20191101145220.qowvzqnkolnwp5kr@gmail.com> <4ac15ac98a94eec8ed58c505d70c4f77cd5114fb.camel@gnu.org> <20191104124109.wv5f5xstpds4giuk@gmail.com> <83mud7g5cd.fsf@gnu.org> <83eeyje7qw.fsf@gnu.org> <83h83da232.fsf@gnu.org> <83mud499w7.fsf@gnu.org> <7e48izb8.321942@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="117740"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Dmitry Alexandrov <321942@gmail.com>, Eli Zaretskii , emacs-devel To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 11 10:47:01 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 1iU6Hj-000USU-D2 for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 10:46:59 +0100 Original-Received: from localhost ([::1]:50276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU6Hi-0000vw-7p for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 04:46:58 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43477) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU6Gn-0000Ie-CK for emacs-devel@gnu.org; Mon, 11 Nov 2019 04:46:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iU6Gm-0003kB-91 for emacs-devel@gnu.org; Mon, 11 Nov 2019 04:46:01 -0500 Original-Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]:34468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iU6Gj-0003il-5P; Mon, 11 Nov 2019 04:45:57 -0500 Original-Received: by mail-il1-x134.google.com with SMTP id p6so11524021ilp.1; Mon, 11 Nov 2019 01:45:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=ppkArI1BmRjpaOdQw/7/0BQD3jEra+U2cV6HMnLg7zI=; b=saTNTS2t/Z+zFsF4q0aWF9yFyFUDCohebM5VqGdGB9EKDu4Yxu3nlGj3lE4fACc4I5 /rMwhd43snyLddhS3/BQaORDj7d0UNeZU4mjt/c9ryeFLwn2r4JNf7GJ8TEFXSLn5Pfs HzjM/b/Dmg1Q/24uPBOMC4G1FPtROJEH6stgfsp2Tt0tAtzgPSiOSu+WcgYpTyvaXxSY /4MaYJU3zjp5+s5PHg4lzEWNXYrFpEaxLnGYa5IzM7o9HrufPNMrZ8CqEBp7fL8PhOv7 YFY0nXWsYG689VIbh9KyulVPIKXCYfIOC1TGcpo7ZucQEGRsFG7NSrWU9VG8mEVpZeXJ QYGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=ppkArI1BmRjpaOdQw/7/0BQD3jEra+U2cV6HMnLg7zI=; b=s7CCYRrIOAmnXlhjLEg4wTEQ0kVvh62aqsgZobfVE9l2fzcyvNyi+PakTVCQ6mTsNf 36Y/BF0oxXsb+XZIncHaFZ5aIlLMzEdpGpS19ngA1UxAK+z6sXOtzc/ZTiGZZpIoy4Yi IpNshB7DcsFP+AFre1GhPBzqVazW2u6iT8ZGVdg0jHNZQ6aRSKUAqzezqo3PbfYvqzL3 MJyLHehqmuHpsVpIFi02e5Sr+3WbGLxRq8E16oZycscyMHrA6azGePuVZYGKNDmYySfu TOEihL/UBZZpplgXFIvvI/bc4vwTmjhQzEfDBs/ZLmJFUHSLLBYdesmWlNKXqNvtB3sK PE2A== X-Gm-Message-State: APjAAAVQpkA1e8R1oB3e5zMDmv2yPCyJx0z/0OpWKoDnLB7+5i7yB9rc XYOssmG5kKS+js17fjtEqI231tL8O95IHdHBPpbxvA== X-Google-Smtp-Source: APXvYqyGSpc0d/mGF4DoEcc5ZBT1qD+uaCsXmo8Zsp5Ipwqk2zopwgsmdn3PyOczkZ1qAkEyDegMaOTi55l0F/f0G/Q= X-Received: by 2002:a92:1513:: with SMTP id v19mr28330612ilk.125.1573465556143; Mon, 11 Nov 2019 01:45:56 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::134 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:242083 Archived-At: On Mon, Nov 11, 2019 at 3:04 AM Richard Stallman wrote: > > [[[ 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. ]]] > > Talking about my problems using git via Emacs and VC. When I tried > this, a few years ago, something gave me three side-by-side windows > and I had no idea what to do with them, so I had to bail out. > > > Maybe, it was ediff-mode? > > What does Ediff mode do? Does it make three windows > side by side? Ediff is an interactive Emacs interface to the classic diff algorithm, where instead of seeing +'s and -'s, you see the two versions that differ, one in each window. You can copy hunks from one version to the other interactive. I think that ediff3, or ediff-files3, is an Emacs interface to the diff3 algorithm, which I know does the same for three versions, but, perhaps much like you, it confuses me a lot. Some people do prefer to handle merge conflicts with it. I handle Git merge conflicts using smerge-mode. In that mode, no new windows are created, but you see annotated and highlighted portions for each conflicting part in the file. For each little conflict region, you can click to decide which of the two versions to keep or manually merge the two into one. smerge-mode is automatically activated when you C-x C-f a file with freshly produced merge conflicts. Jo=C3=A3o