GitButler 0.13 - "Lucky Baseball"

It has been 4 months since our last minor release. In that time, we have done 27 patch releases, adding lots of small features, bug fixes, performance improvements and experiments.

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. Let's take a quick look at that, and all the other fun stuff in our new release.

When we started working on GitButler's virtual branches, we knew we needed a way to handle merge conflicts, otherwise you would get in a stuck state at some point. What we came up with wasn't great, and we knew it, but it at least worked.

When you updated from upstream, we would unapply any branches that conflicted with the new incoming code. You could then re-apply them one by one to fix any conflicts, but only as a final merge commit. It was really not a great experience.

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.

Leave a Comment