GitButler now supports first class conflicts, making rebasing less annoyingblog.gitbutler.com109 pointshemogloben2 years ago