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: Making git as easy as CVS, for handling merge conflicts Date: Mon, 11 Nov 2019 10:36:14 +0000 Message-ID: <0BD7E783-A5BD-46BF-918F-35A84FF47A97@gnu.org> 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="73680"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: K-9 Mail for Android Cc: Dmitry Alexandrov <321942@gmail.com>, emacs-devel To: emacs-devel@gnu.org, =?ISO-8859-1?Q?Jo=E3o_T=E1vora?= , Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 11 11:36: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 1iU73g-000J1M-0F for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 11:36:32 +0100 Original-Received: from localhost ([::1]:50676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU73e-0008Pc-C6 for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 05:36:30 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50221) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU73Y-0008O2-IN for emacs-devel@gnu.org; Mon, 11 Nov 2019 05:36:25 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:41227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iU73Y-0008SH-E9; Mon, 11 Nov 2019 05:36:24 -0500 Original-Received: from [92.54.140.178] (port=49096 helo=[192.168.52.197]) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1iU73R-0000HG-2u; Mon, 11 Nov 2019 05:36:17 -0500 In-Reply-To: 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:242084 Archived-At: 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 =20 > ]]] > > [[[ whether defending the US Constitution against all enemies, =20 > ]]] > > [[[ foreign or domestic, requires you to follow Snowden's example=2E > ]]] > > > > Talking about my problems using git via Emacs and VC=2E 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=2E > > > > > Maybe, it was ediff-mode? > > > > What does Ediff mode do? Does it make three windows > > side by side? >=20 > 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=2E You can copy hunks from one > version to the other interactive=2E >=20 > 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=2E Some people do > prefer to handle merge conflicts with it=2E >=20 > I handle Git merge conflicts using smerge-mode=2E In that mode, > no new windows are created, but you see annotated and > highlighted portions for each conflicting part in the file=2E For each > little conflict region, you can click to decide which of the two > versions to keep or manually merge the two into one=2E >=20 > smerge-mode is automatically activated when you C-x C-f a > file with freshly produced merge conflicts=2E >=20 > Jo=C3=A3o The context of this will be better understood if you first read the relate= d duscussion on gnu-system-discuss, where it started=2E RMS described ther= e something that happened to him dyring resolution of Git conflicts=2E