On Sat, Mar 4, 2023 at 9:36 PM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Sat, Mar 4, 2023 at 3:57 AM Edmundo Carmona Antoranz > <eantoranz@xxxxxxxxx> wrote: > > > > On Sat, Mar 4, 2023 at 12:45 PM Edmundo Carmona Antoranz > > <eantoranz@xxxxxxxxx> wrote: > > > > > > Usercase can be at the moment trying to rebase (with merges) on top of > > > an exact base copy. In cases like this, git just crashes on merge > > > commits. An easy example: > > > > I should have said _crashes on merge commits where there was a conflict_. > > Crash tends to mean the program has done something not allowed by the > operating system. I don't think that's what's happening here. Do you > mean Git stops with conflicts? Ok, sorry for the sloppy wording. Yes, it stops with conflicts.
