Subject: Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"

From: Sergey Organov <[email-masked]>
Date: Sat, 25 Feb 2023 18:15:40 +0300

Elijah Newren <[email-masked]> writes:

> On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov <[email-masked]> wrote:
>>
>> Elijah Newren <[email-masked]> writes:

[...]

> Please, go read at least [1] to see Johannes comments about how the
> prior proposals don't work beyond simple cases.

It's exactly handling of simple cases that we need most. We can get
fancy afterwards, if feasible.

Thanks,
-- Sergey Organov