From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.devel Subject: Re: Regarding smerge upper/lower; needs NEWS Date: Thu, 15 Mar 2018 15:30:18 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000f2a44d0567752bc9" X-Trace: blaine.gmane.org 1521127728 20627 195.159.176.226 (15 Mar 2018 15:28:48 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2018 15:28:48 +0000 (UTC) Cc: Glenn Morris , Noam Postavsky , Stephan.Mueller@microsoft.com, Stefan Monnier , "emacs-devel@gnu.org" To: Richard Copley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 15 16:28:44 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ewUo6-0005F5-MB for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 16:28:43 +0100 Original-Received: from localhost ([::1]:52145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUq9-0002kC-Dl for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 11:30:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUpy-0002k3-LV for emacs-devel@gnu.org; Thu, 15 Mar 2018 11:30:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewUpx-0004CH-MF for emacs-devel@gnu.org; Thu, 15 Mar 2018 11:30:38 -0400 Original-Received: from mail-yw0-x229.google.com ([2607:f8b0:4002:c05::229]:44424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewUpr-00040u-5r; Thu, 15 Mar 2018 11:30:31 -0400 Original-Received: by mail-yw0-x229.google.com with SMTP id x197so4843514ywg.11; Thu, 15 Mar 2018 08:30:30 -0700 (PDT) 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; bh=TUsKlSZqhBmIwtBFO83KYT4q94/7AekQjc9OiTkGtO8=; b=G9mpmShDBb7fN32we3IXXH8Tw1olP6qGsOOGBGzED4cxhBXNn9ezYUiWcJ/TC7aqBg NA7fKYeSMZGV6ktptc9iTdvhBjrj+YnOwG1g05CgO/TwTCNvQOss9d0XZGrFNeEsYp4T AOczv1SGfEOwFoagtzHHQFZWmDPkr59NAwPktMM43qeK2D/2nOgtsyQ2ZGonPsh0op4Y t+T/+i3B32i87vN3F5pyn08iR4+DytxM0C49aT/Sz+8I/69gnHDh8NN06rVGXscUCccY V+a7C7sRdW048rfx3D5cVzXF4X5TMIrP3mGIJU+Qo04FYLmQ9vcm4AAs/208STUubdVR 4xjw== 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; bh=TUsKlSZqhBmIwtBFO83KYT4q94/7AekQjc9OiTkGtO8=; b=JYbcPuhXhJjEDO2arvbMQTPsgSVj8kHu6uVpdVLPgm/tlwTGeVHi7FkwkiopOrTYDz HSriSArsF3o32E2wOCvRXUpywVjW7E9QSTJWcPPXoQ8KsptADDi/RUqArKVpryntVx9h V25yZzFBbTffdsnI9x5nawtUmyIftBSvPOLzCZ4lCaXYxfkAcHK+p3BYcI0FxQDidTCc zct3gcz74Ig2TFH/n7bI7p4mBOJNHDBOVdpx+Jel7245E/urYFhXZVkznm2Hrkdl342J KFjM/y0szgwmHC8p1bZkPj1jJDRIfca6nVKOcy2YBaHNhXI0AunfQjwcukb2cB0+F8a5 7ptw== X-Gm-Message-State: AElRT7Ep26PWVZTus8FImHIG/OSxlnXUSEn/QVdumBrFDnhbYScs0gNO o+8MS+4IF5QI6jMbZUCBOavAONIgKa2qsNMc/Wk= X-Google-Smtp-Source: AG47ELt5+I080YZ4J76pJuCe14YY9CRT+uQIn8IfWOtC0Jsbk0L3AyNiaPc6Fk55mpthePAQvAjNTXBNOaRjRv7NOek= X-Received: by 2002:a25:b9c3:: with SMTP id y3-v6mr6090581ybj.263.1521127829708; Thu, 15 Mar 2018 08:30:29 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c05::229 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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:223744 Archived-At: --000000000000f2a44d0567752bc9 Content-Type: text/plain; charset="UTF-8" On Thu, Mar 15, 2018 at 10:38 AM Richard Copley wrote: > "A" and "B" are the names diff3 uses for the conflict markers. > I would find that very confusing in Smerge. > "A" and "B" are the names used in the documentation. > Which documentation? If Smerge documentation, then it should be fixed to update to the convention of upper/lower? > "UPPER" and "LOWER" are useless since they don't match up with anything > else (the conflict markers and the documentation). > I have never found that convention confusing.. We are strictly speaking of the use of upper/lower in Smerge. > "UPPER" and "LOWER" are confusing since they are often shown on the left > and right respectively. > Hmm, the conflicts don't show up left/right for me.. How are you using Smerge? > Why is this change good? What am I missing? > Well, it worked great for me. FYI, I am just an Smerge user (not contributor), and this was a welcome change for my use case.. never done conflict merging using Smerge using left/right orientation as you suggest. -- Kaushal Modi --000000000000f2a44d0567752bc9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Mar 15= , 2018 at 10:38 AM Richard Copley <= rcopley@gmail.com> wrote:
"A" and "B&qu= ot; are the names diff3 uses for the conflict markers.

I would find that very confusing in Smerg= e.
=C2=A0
=
"A" and "B" are the names us= ed in the documentation.

<= div>Which documentation? If Smerge documentation, then it should be fixed t= o update to the convention of upper/lower?
=C2=A0
<= /div>
"UPPER" and "LOWER" are= useless since they don't match up with anything else (the conflict mar= kers and the documentation).

I have never found that convention confusing.. We are strictly spea= king of the use of upper/lower in Smerge.
=C2=A0
&q= uot;UPPER" and "LOWER" are confusing since they are often sh= own on the left and right respectively.
<= div>
Hmm, the conflicts don't show up left/right for me..= How are you using Smerge?
=C2=A0
= Why is this change good? What am I missing?

Well, it worked great for me. FYI, I am just an Smerge use= r (not contributor), and this was a welcome change for my use case.. never = done conflict merging using Smerge using left/right orientation as you sugg= est.
--

Kaushal Modi

--000000000000f2a44d0567752bc9--