1GitButler now supports first class conflicts, making rebasing less annoying (opens in new tab)(blog.gitbutler.com)109hemogloben1y ago113
