With our new 0.14 release, GitButler can now stack your branches!
This means that you can start a new branch based off of another branch that it is dependent on and review each dependent group of commits independently.
Stacking your branches helps to solve the problem of reviewing dependent groups of code without having to pile them all into a single branch.
This not only makes it easier to review logical groups of code changes, but it also allows you to continue working on something while waiting for dependent branches to get merged.
For example, let's say that you are working on a new feature. You get the base of the feature ready to go out and start the process of getting it upstreamed into the main branch. As you're waiting for that process, you can then start a new branch based off of it. As you get feedback on the first branch, you can absorb or squash work into it while continuing to work on your new features too.
We also have GitHub Pull Request integration to add a nice status update to each of your stacked branches that tells everyone that this branch is part of a stack and what the status of each branch in the stack currently is:
Stacking branches also works great with our independent branching feature - you can even have multiple virtual branches each with stacks of branches in them.
Now, as you're working on your code, you can decide if the code you're working on is dependent on other code or not and organize your commits along those lines, quickly and easily.
Together with GitButler's drag and drop rebasing, squashing and splitting features, managing changes to your codebase is easier than ever.
To try out our new stacked branching features, download the new version of GitButler today and check out the docs.