Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
- From
Sergey Organov <sorganov@gmail.com>
- Date
- Feb 25, 2023, 15:15 UTC
- Message-ID
- <87fsatixnn.fsf@osv.gnss.ru>
- In-Reply-To
- <CABPp-BHRbKG_cXdwaPT0-Rj6QTkkJRcT4N0f45==i7oAqiTC+w@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
> On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov <sorganov@gmail.com> wrote: >> >> Elijah Newren <newren@gmail.com> 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