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_.
