B blog.gitbutler.com GitButler now supports first class conflicts, making rebasing less annoying 109 points hemogloben 2 years ago 113 comments