>> The rebase vs merge disaster > ??? How is this a disaster? Not a disaster, but merge was not strictly needed. We could've lived with rebase only. But in g

>> The rebase vs merge disaster > ??? How is this a disaster? Not a disaster, but merge was not strictly needed. We could've lived with rebase only. But in git (unlike in jj) rebase is deeply flawed. If you ever needed to resolve the same conflict through several commits you know it. That flawed git implementation is why people kept using merge yo solve the problem on a single final commit.