Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
- From
Elijah Newren <newren@gmail.com>
- Date
- Feb 25, 2023, 16:28 UTC
- Message-ID
- <CABPp-BF3JUg4jThS8Y_3v-tOEey55V_9KpXRZ3HvfaC3S2m=GQ@mail.gmail.com>
- In-Reply-To
- <87fsatixnn.fsf@osv.gnss.ru>
On Sat, Feb 25, 2023 at 7:15 AM Sergey Organov <sorganov@gmail.com> wrote:
Show 14 quoted lines
> > 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.
If we can handle just the simple cases without making common cases significantly worse, that'd be a potential path forward. Any proposal involving the diff between a merge commit and either of its parents (or an equivalent such as a three-way merge involving the merge commit and one of its parents) doesn't achieve that, IMO.