From: Michael Heerdegen <michael_heerdegen@web.de>
To: Sergey Organov <sorganov@gmail.com>
Cc: help-gnu-emacs@gnu.org
Subject: Re: Looking for a helper for advanced conflicts resolution.
Date: Fri, 24 Jul 2020 21:48:37 +0200 [thread overview]
Message-ID: <871rl0g0dm.fsf@web.de> (raw)
In-Reply-To: <87imeclqyz.fsf@osv.gnss.ru> (Sergey Organov's message of "Fri, 24 Jul 2020 21:15:16 +0300")
Sergey Organov <sorganov@gmail.com> 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.
next prev parent reply other threads:[~2020-07-24 19:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 11:07 Looking for a helper for advanced conflicts resolution Sergey Organov
2020-07-24 16:25 ` Michael Heerdegen
2020-07-24 18:15 ` Sergey Organov
2020-07-24 19:08 ` wgreenhouse
2020-07-24 19:48 ` Michael Heerdegen [this message]
2020-07-24 19:56 ` Sergey Organov
2020-07-24 22:29 ` Michael Heerdegen
2020-07-25 11:37 ` John Yates
2020-07-24 19:06 ` Yuri Khan
2020-07-24 19:49 ` Sergey Organov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871rl0g0dm.fsf@web.de \
--to=michael_heerdegen@web.de \
--cc=help-gnu-emacs@gnu.org \
--cc=sorganov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).