[revskill]

Not quite. We have a workflow to resolve conflict though. All needed is just git merge, git pull. You need workflow, not git rebase.

[blowski]

A lot of very smart people disagree with you.

[bonzini]

Then you must have never used "git bisect"? Or only bisect on the first parent?