GitButler now supports first class conflicts, making rebasing less annoying

Comment

Save my name, email, and website in this browser for the next time I comment.

Δ