Last week we released GitButler 0.13, which is our first release with our new Fearless Rebasing feature, taking a completely new approach to handling branch conflicts. However, now we implemented Fearless Rebasing, where we can record conflicts in the commits themselves and allow you to fix them at any time, even continuing to work while older commits are still in a conflicted state. For each virtual branch, we will tell you if there is a conflict or it can be cleanly rebased or merged, or if the branch has been integrated.