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 10:49:02 +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> <0BD7E783-A5BD-46BF-918F-35A84FF47A97@gnu.org> 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="130978"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Dmitry Alexandrov <321942@gmail.com>, Richard Stallman , emacs-devel To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 11 11:49:53 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 1iU7Gb-000Xpj-24 for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 11:49:53 +0100 Original-Received: from localhost ([::1]:50866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU7GZ-0005kz-O4 for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 05:49:51 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52844) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU7G1-0005jf-Aw for emacs-devel@gnu.org; Mon, 11 Nov 2019 05:49:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iU7G0-00089D-5K for emacs-devel@gnu.org; Mon, 11 Nov 2019 05:49:17 -0500 Original-Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]:39643) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iU7Fy-00088w-MW; Mon, 11 Nov 2019 05:49:14 -0500 Original-Received: by mail-io1-xd36.google.com with SMTP id k1so14072948ioj.6; Mon, 11 Nov 2019 02:49:14 -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=1FfRq5lVQYpeywJDIO3kciIvJjRkLIpW2MlBOaekyPA=; b=Ewu71RXWG/k3bZnYHtBwjlLu0kir8EQMXwkZ1TsMBuSjfmRqO0EzNpliobYP1G37KZ PUsFwlI52wOmvsz460F5sS0jxoPVJ699um+jdoHSF/CdkpoUp4L55RBpk/1L+uj4EzSE Ak17nz5rfpewD9ACSA10yXWn9ZCT5GW+IGhpkuKgBUCVajg7LUHsQ+ny96axhk5eoxiD SGfBrUhXULmF+v/xkSrw2FTqH1/vqNk2xzGiuMpCpJ7g5oUGDZtPfxQspq/fLKX+pu4v LjOokaYyWCulDiFrXiuQCLChqcibnqYMuRRFtVbZq/O2GHnwCpfT2kuDcLxmZm9z/8o0 iUTg== 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=1FfRq5lVQYpeywJDIO3kciIvJjRkLIpW2MlBOaekyPA=; b=Wiia1Hc6MFx6aEReNLaQX2eI5CD/Ei3a9rmDFIVEBjXy484X0kCW/Jri4PzqcrLDMI E5bSEtIfYH9d5ZGpvpmH2y1Ob+TWHA9rJSJA/HPLNTeANSquUs7ZglmbFZuUZjf5oCCu +gb18S4z/owuCFQ+Us7gNZh26stESmvFQzpa2Po24kYeq7K8QAySRChtzhHnS8VeyDan 7LUPBLxIBOy8pw2zalA6CKdacY5NKLDiIN+DVCUi/Gte1uN/eBuNfg1YJihuKsnlGP8b waFHfPZi44PWFG906VfvdVLNFfzGymsyRwY+qrrS3a6V0DSUjexRqhHaYTz4USHXBtLz Yu5w== X-Gm-Message-State: APjAAAWqY5R5GUNelEuUo0g5X1uJ3CgddnyQtZNVxZ39xizwyb81MZz5 p+S7CTHEVTz0GQnj27TNgr4meVEzZU26biHv+ZduRw== X-Google-Smtp-Source: APXvYqxp/1pSvaKvl7aj9uVceb4J+KTXoUHcc/cxod6Ywjspdox0V35t/+vaH01oKIJJiUldt2ZeNHMpmMNqiccR+Zs= X-Received: by 2002:a6b:b2d5:: with SMTP id b204mr9867976iof.137.1573469353565; Mon, 11 Nov 2019 02:49:13 -0800 (PST) In-Reply-To: <0BD7E783-A5BD-46BF-918F-35A84FF47A97@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d36 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:242085 Archived-At: On Mon, Nov 11, 2019 at 10:36 AM Eli Zaretskii wrote: > > On November 11, 2019 9:45:44 AM GMT, "Jo=C3=A3o T=C3=A1vora" wrote: > > 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 > > The context of this will be better understood if you first read the > related duscussion on gnu-system-discuss, where it started. > RMS described there something that happened to him dyring > resolution of Git conflicts. Oops. I don't subscribe to that group. I just tried answering Richard's question "What does ediff mode do". Sorry for the extra noise, then. Jo=C3=A3o