From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: wgreenhouse Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Fri, 24 Jul 2020 15:08:02 -0400 Message-ID: References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> <87imeclqyz.fsf@osv.gnss.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38920"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) To: help-gnu-emacs@gnu.org Cancel-Lock: sha1:SHMFsxl+hZKQLb2zlKt7/D9WlH0= Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 21:25:49 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 1jz3KG-000A09-PQ for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 21:25:48 +0200 Original-Received: from localhost ([::1]:33390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz3KF-0000wT-QO for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 15:25:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz3Jd-0000wE-Eo for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:25:09 -0400 Original-Received: from static.214.254.202.116.clients.your-server.de ([116.202.254.214]:36100 helo=ciao.gmane.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz3Jb-0001bO-Vu for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:25:09 -0400 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1jz3JV-00097Y-QR for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 21:25:01 +0200 X-Injected-Via-Gmane: http://gmane.org/ Received-SPF: pass client-ip=116.202.254.214; envelope-from=geh-help-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 15:25:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:123583 Archived-At: Sergey Organov writes: > Michael Heerdegen writes: > >> Sergey Organov writes: >> >>> Hello, >>> >>> 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')? > > Dunno, will try it, thanks for pointing! > >> I'm using Ediff. AFAIR Ediff can't do the analogue out of the box when >> merging, but it's not hard to implement. > > Yeah, that was my first candidate, and I've tried to invoke it from > magit, but it doesn't seem indeed to have the feature. Implementing it > probably is not a big deal indeed, with or without ediff, I just hope to > find something ready. There is `smerge-ediff'.