2 ms·

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 5y ago
  A lot of very smart people disagree with you.
• bonzini 5y ago
  Then you must have never used "git bisect"? Or only bisect on the first parent?