From: Sergey Organov <sorganov@gmail.com>
To: Yuri Khan <yuri.v.khan@gmail.com>
Cc: Michael Heerdegen <michael_heerdegen@web.de>,
help-gnu-emacs <help-gnu-emacs@gnu.org>
Subject: Re: Looking for a helper for advanced conflicts resolution.
Date: Fri, 24 Jul 2020 22:49:28 +0300 [thread overview]
Message-ID: <87eep0lmlz.fsf@osv.gnss.ru> (raw)
In-Reply-To: <CAP_d_8XthCtShAkmRHjrdN465BX4FknxfRTR5Ebgj5X5jv0UKQ@mail.gmail.com> (Yuri Khan's message of "Sat, 25 Jul 2020 02:06:56 +0700")
Yuri Khan <yuri.v.khan@gmail.com> writes:
> On Fri, 24 Jul 2020 at 23:27, Michael Heerdegen
> <michael_heerdegen@web.de> wrote:
>> Sergey Organov <sorganov@gmail.com> writes:
>> > 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')?
>
> +1 to smerge. In the majority of complex conflicts I face, I can
> toggle ‘smerge-refine’ a couple times, choose one side that has the
> easier diff, and manually apply it to the other side. I don’t even
> have to see the 2-way diffs.
Thanks for the tip! I now can't even believe I didn't look as smerge
myself, even though I was aware it exists!
-- Sergey
prev parent reply other threads:[~2020-07-24 19:49 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
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 [this message]
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=87eep0lmlz.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=help-gnu-emacs@gnu.org \
--cc=michael_heerdegen@web.de \
--cc=yuri.v.khan@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.
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.