On: GitButler now supports first class conflicts, making rebasing less annoying

[samatman]

I don't understand why this would make a difference.

Any given snapshot has a linear history, so it should be as bisectable as the rebased equivalent. What am I missing here?

[nh2 → samatman]

> Any given snapshot has a linear history

Not sure what you mean. The key thing of merges is that they... merge... two histories.

A git history graph tool shows that clearly then.

A bisection has to choose whether to go left or right.

[Arelius → samatman]

Agreed… I think people like to think bisect doesn’t work with merges also.