On Sat, Feb 25, 2023 at 7:15 AM Sergey Organov <sorganov@xxxxxxxxx> wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > > On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov <sorganov@xxxxxxxxx> wrote: > >> > >> Elijah Newren <newren@xxxxxxxxx> 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.
