From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Fri, 24 Jul 2020 22:49:28 +0300 Message-ID: <87eep0lmlz.fsf@osv.gnss.ru> References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19998"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Michael Heerdegen , help-gnu-emacs To: Yuri Khan Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 21:50:06 2020 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jz3hk-00056b-G9 for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 21:50:04 +0200 Original-Received: from localhost ([::1]:40942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz3hj-0006Rs-Hm for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 15:50:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz3hF-0006Ow-M1 for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:49:33 -0400 Original-Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]:41808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz3hE-00054p-53 for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:49:33 -0400 Original-Received: by mail-lj1-x229.google.com with SMTP id a27so1658678ljn.8 for ; Fri, 24 Jul 2020 12:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=JkVjT5y41+3c6q4oH9Kuz/CqEYYtUQeniZH0elS60TI=; b=i+zIoFhNbGby0dFuEvORLvOs8wyCkMhQV319PQR7B5Er7Xnp7FAVXX2uPQz0/SwtBO PRkdUDZBnLMl8fQJVziwrqFIkXwb5l1eNR5Mf+TgO3eCZz+2Ud+Gd224PmXieEvNk5f8 KHIWe7+1JdiBICIZhqGrEw2HQRXSdLJ3iIpTCcnvwzAHVU0gUt7h+qYLPN6eDITD/rba e41wG3gLwf9VWDyrgE73Y6Qw25lUKWhbZ0nSDumOZ62j9x1PCcsGimkl/PZIjKo3iOe4 GS+KrnoV1vgzj+2gbnAffztmxGp+9EXlnOq9JcFt0YaupYYWMo15SuW4X8huITFMY7R9 QsgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=JkVjT5y41+3c6q4oH9Kuz/CqEYYtUQeniZH0elS60TI=; b=lomEDV7T5uhrWAFQVCk7W2XV+J0FnOfCMC2LLWEnt0Hg3wHJK6FDf9SD4IUVb5vk99 qlg5u6OhEP63L2HvDBF/TZAW1jHoGbSc/XWFX/ZaR1uaPJnP4QC/ST5IPQD5NfGXIwtP B0wnAgDOi/cDrCqB0V418scyn64XdWF5Jfg+cwcWPrXKXddYaE/BCQVbLM76PeuHtMif xoyFKf5nUzX3WyeF+udX9czO9L/R/7Z5EtUzkeOunOhiVLqMKSZda0zlIq5oCpEaxIum n5n9fjgNVhGlzHwFuY3sDBx6CIp3Raz2dxK0U33xOMsxSzaKQ/CYW1uZ+bOzQt86kG1k UJXg== X-Gm-Message-State: AOAM530lo/ki+yPquyOrItKqUDDgVV+/8DB4K5jgUyWmymkt2AmfESry 8lYyMjZSbsFtAx55LkcPWv6LKoYL X-Google-Smtp-Source: ABdhPJyXZRYoCUCaQLye50muR8CfeE3IYuQuYwfMa+J16RLF8CnHqafOHXuuRBJvskureb6iRrMVxw== X-Received: by 2002:a2e:3216:: with SMTP id y22mr4916129ljy.328.1595620169759; Fri, 24 Jul 2020 12:49:29 -0700 (PDT) Original-Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id r16sm240904ljk.8.2020.07.24.12.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 12:49:29 -0700 (PDT) In-Reply-To: (Yuri Khan's message of "Sat, 25 Jul 2020 02:06:56 +0700") Received-SPF: pass client-ip=2a00:1450:4864:20::229; envelope-from=sorganov@gmail.com; helo=mail-lj1-x229.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.io gmane.emacs.help:123584 Archived-At: Yuri Khan writes: > On Fri, 24 Jul 2020 at 23:27, Michael Heerdegen > wrote: >> Sergey Organov writes: >> > To aid in resolution of complex conflicts, I'd like to know if there is >> > a tool in Emacs that, given diff3-style 3-way conflict output, would >> > convert it into 2 simple diffs: "mine" changes from common ancestor, and >> > "yours" changes from common ancestor. Does anybody know about one? >> >> Doesn't "smerge" do that (`smerge-diff-base-upper', >> `smerge-diff-base-lower', `smerge-diff-upper-lower')? > > +1 to smerge. In the majority of complex conflicts I face, I can > toggle ‘smerge-refine’ a couple times, choose one side that has the > easier diff, and manually apply it to the other side. I don’t even > have to see the 2-way diffs. Thanks for the tip! I now can't even believe I didn't look as smerge myself, even though I was aware it exists! -- Sergey