From: Sergey Organov <sorganov@gmail.com>
To: Michael Heerdegen <michael_heerdegen@web.de>
Cc: help-gnu-emacs@gnu.org
Subject: Re: Looking for a helper for advanced conflicts resolution.
Date: Fri, 24 Jul 2020 21:15:16 +0300 [thread overview]
Message-ID: <87imeclqyz.fsf@osv.gnss.ru> (raw)
In-Reply-To: <87blk4g9rh.fsf@web.de> (Michael Heerdegen's message of "Fri, 24 Jul 2020 18:25:54 +0200")
Michael Heerdegen <michael_heerdegen@web.de> writes:
> Sergey Organov <sorganov@gmail.com> 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.
Thanks,
-- Sergey
next prev parent reply other threads:[~2020-07-24 18:15 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 [this message]
2020-07-24 19:08 ` wgreenhouse
2020-07-24 19:48 ` Michael Heerdegen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87imeclqyz.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=help-gnu-emacs@gnu.org \
--cc=michael_heerdegen@web.de \
/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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.