unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: Sergey Organov <sorganov@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Looking for a helper for advanced conflicts resolution.
Date: Fri, 24 Jul 2020 14:07:06 +0300	[thread overview]
Message-ID: <878sf9tbmt.fsf@osv.gnss.ru> (raw)

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?

I.e., given:

<<<<<<< A
lines from A
||||||| B
lines from B
=======
lines from C
>>>>>>> C

Produce:

1. diff of "lines from B" and "lines from A"
2. diff of "lines from B" and "lines from C"

For example, I'd like to be able to select the chunk in the buffer, and
call a function that'd create another buffer with these 2 diffs.

Thanks,
-- Sergey



             reply	other threads:[~2020-07-24 11:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-24 11:07 Sergey Organov [this message]
2020-07-24 16:25 ` Looking for a helper for advanced conflicts resolution Michael Heerdegen
2020-07-24 18:15   ` Sergey Organov
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

  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=878sf9tbmt.fsf@osv.gnss.ru \
    --to=sorganov@gmail.com \
    --cc=help-gnu-emacs@gnu.org \
    /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).