From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Sat, 25 Jul 2020 02:06:56 +0700 Message-ID: References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39665"; mail-complaints-to="usenet@ciao.gmane.io" Cc: help-gnu-emacs To: Michael Heerdegen Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 21:07:31 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 1jz32Z-000AE8-3Z for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 21:07:31 +0200 Original-Received: from localhost ([::1]:49240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz32X-00021I-V6 for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 15:07:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz32E-000218-PT for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:07:10 -0400 Original-Received: from mail-ua1-x930.google.com ([2607:f8b0:4864:20::930]:41475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz32D-0007Dv-9f for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:07:10 -0400 Original-Received: by mail-ua1-x930.google.com with SMTP id u6so3289805uau.8 for ; Fri, 24 Jul 2020 12:07:08 -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:content-transfer-encoding; bh=AKayrfyiVrKrcR6GdtNdZ0np0wq+5zPkl9jZgT0b/tg=; b=cpU4X1+6u88GZZC3ASmSmSzU6Ei+DvWAipK0/kibeo4UyQqbEd3tCGvdNQ1TQDelFh ctCRiK+JaDYDMaDQcTYSDucxgq7uhM9gZXI8lj2b3R8jZ3Y9feddI6uGIzlx7+Y9Y1mO VslEA133GlN5qzBjNC2Y0Rcdc/cnnGBlWD4Q7mrcuZ721H/WQl3SX2/LvkrP+FKgPVg0 cpKcmGWYz3lUoXPG5syyDQY06OT6XBJJ9roo4pm4eRdpDzovg108Iu0E2VGozMRPb8CB JTae8/cMjTk8Q8uq6J3MviDqNT2VaYBbJPyC1s6qlpySVbk4iZcwx6ouyhkEh29Z2bLg 82CQ== 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=AKayrfyiVrKrcR6GdtNdZ0np0wq+5zPkl9jZgT0b/tg=; b=BSMp34nOy+mHrbHho0ZIuXgo2kUp0tq6JQyZGxGcao52BQgectlTHsarTu+7jQF+s6 CNsaeM3aLEhWogfiYqrRZgILDtjz1VTbW5JezYB/bwz5z3yvHk3gFarv3geJpu00CdRt B5v6OWhMb/N9jAr9x97sx3EqFdRc7x0wu0I4VjAkqhn5uyxB1nvV9yCVeERC/7+bXd/R ix0rPzkw268jN6kcOVEqzhblXgWE+0pOYOTue08LTK25qKL64tZVbhfzJpwN6wd4xc48 1EOddNZRDntq14auo4yvKUjCU+3ow2tWnY2byb6hV8GgemJvPnFUJ4N5r6ZQZJDJTQth lgoQ== X-Gm-Message-State: AOAM5308KdoW62nXycMIsovOIvWM/DZcW7uPzBhUbZI69CfhzscsVSmp ODgNoIQy+V9OEhziajf1CUZjzDgyGop9tqhdp2s= X-Google-Smtp-Source: ABdhPJxM3Sa9gXc0JF8fo1oB+QxCfJvRWAb0qqMEySJoyNv4eoyqUr8dOIYnmCG4vR+4FZ9yfHkIpFMGx05aDxrh3qQ= X-Received: by 2002:ab0:7551:: with SMTP id k17mr9273595uaq.102.1595617628204; Fri, 24 Jul 2020 12:07:08 -0700 (PDT) In-Reply-To: <87blk4g9rh.fsf@web.de> Received-SPF: pass client-ip=2607:f8b0:4864:20::930; envelope-from=yurivkhan@gmail.com; helo=mail-ua1-x930.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:123582 Archived-At: 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, an= d > > "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 =E2=80=98smerge-refine=E2=80=99 a couple times, choose one side that= has the easier diff, and manually apply it to the other side. I don=E2=80=99t even have to see the 2-way diffs.