[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Looking for a helper for advanced conflicts resolution.

From: wgreenhouse
Subject: Re: Looking for a helper for advanced conflicts resolution.
Date: Fri, 24 Jul 2020 15:08:02 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)

Sergey Organov <> writes:

> Michael Heerdegen <> writes:
>> Sergey Organov <> 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.

There is `smerge-ediff'.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]