Re: Looking for a helper for advanced conflicts resolution.

[Yuri Khan]

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.