GitButler now supports first class conflicts, making rebasing less annoyingblog.gitbutler.com·109 pts·hemogloben·113