From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.help Subject: Re: Looking for a helper for advanced conflicts resolution. Date: Fri, 24 Jul 2020 21:48:37 +0200 Message-ID: <871rl0g0dm.fsf@web.de> 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="21936"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: help-gnu-emacs@gnu.org To: Sergey Organov Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 21:50:33 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 1jz3iD-0005cQ-JC for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 21:50:33 +0200 Original-Received: from localhost ([::1]:39990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz3iC-00061J-FD for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 15:50:32 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz3gS-000617-61 for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:48:44 -0400 Original-Received: from mout.web.de ([212.227.15.4]:60897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz3gQ-0004wI-CV for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:48:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1595620118; bh=IWmWMpd3sTEYhKasQlqM626d231+tbqn7mqHtwqXmUI=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=DZKI9BKtHTgH87h+JB5Uv0juEDPO4VTXzqW19/nz9jph+bXZmDU4nQ0E0c/l6bgzh mnEs9dC+as9GoItY1tvIcjN4y+cpHWfRN7dX8FcZlIOS9g2eqsuxH8wxXkXbRxr/Bc QmVrsk/A/fiEUCQMA2YIO/Xq3O3Ds6cZv2BryVpw= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Original-Received: from drachen.dragon ([92.76.215.78]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M0yjP-1ko86L0JEV-00v48s; Fri, 24 Jul 2020 21:48:38 +0200 In-Reply-To: <87imeclqyz.fsf@osv.gnss.ru> (Sergey Organov's message of "Fri, 24 Jul 2020 21:15:16 +0300") X-Provags-ID: V03:K1:ld0jr5ccdlHKFftkoNfDaBbziFaHxiJCVxahC0LKh6ba+njtQNL enOhwbOF8RYW9kqVPH0qNhWBWsWhDsQSQ6HVxM0n3r5Ov8fHXijviFGB017qCQvJChoCEBL 7mj3qFQXR2xTCcxphfJ9y6/XfDz6n9Te4MIr4kKxFc4DUI3MCdV+hTpEuaW5tCs+S1sOAd5 BzmkRXNru10dPEGZ+eBdg== X-UI-Out-Filterresults: notjunk:1;V03:K0:5KMATOyDNLM=:WnVWtI/T9CRt5L5io2ex/U HcPFozU+p640R1/b1Xk8PMUQg1hbHVvlRTg3opSCNtRFbPKT2Nj/nQeK3s3Fw+vGNnRjViTX0 t+YQOGGCKUPnatNO+F77tM9RHK/6pOCfK9UZQkDZOADuBCeryfxMKVjKfW1Mhjz3S7GQP7w5m PBLwbGOTYv+nhWM2bt9z/MFI5y5CLoujib+g9oDrxflvcFbXfmhW8RO4q28S3UeTBghwdPQeq oXFir7o8loJtOMbQcoXuU3n6MIFH2Nl7QWgIgPV5vg0nfUCm4IGJbybpNBOepcIH90dc0bXk0 nt91y4B2eUlWv5UMNGRak5c3oYZcWudF7d5Sm4vGBna1VWCyANiF+CbS/9zdo1DLhOaEThQVf rs1MqUlHIoUwv7dy6l/eupEPOwpXfIuPaxVFNcfm/FiKHQvWb1CImYU3qkLq4a1APg4Y7Rqd5 q8DkD2Xf0f0TkYJaupxGowVv+IEHeUvFDykEHqPco17IqKkfMjA97jG/SrzVzqUzJ2drPlSEO ADPmYg6VJm36VdPUzdEETwJpudil1ZL+pk5DvoTxsr9YZjf1i2HF0xYtpSrZSJBeWwG3I8ViG 54EVO4aBKMUP5Npj25UtdKRTL8YjxO3ts1OtHMquk9rvSUfUpk7vnLdBuGs/QnzvtwrgpXJw/ KeWTpMFCdUFheUX+JjsRPJonrl+ibZL91vWHqrqza27Gp9eRbhnarCv5ok2wDCa9oGC0ak2Cp ahfj6lUgcwl/tVuZxSg1mojz95G7+YEwUwQWGilAVeWK5U0GXOpnu3/4FbruxKtDh9gI1B5q Received-SPF: pass client-ip=212.227.15.4; envelope-from=michael_heerdegen@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 15:48:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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:123585 Archived-At: Sergey Organov writes: > 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 [...] I did implement that but haven't yet packaged it. When you have an ediff3 to merge, basically, all you have to do is to add bindings to `ediff-mode-map' that call `ediff-buffers' with two of the buffers (from `ediff-buffer-A', `ediff-buffer-B', `ediff-buffer-C', `ediff-ancestor-buffer'). One problem is that the highlighting of the current Ediff session gets in the way; one has to remove and later restore it. Another problem is that you want to be automatically guided to the current thunk, so you have to care about this as well. But all of that is easy achieve. Michael.