GitButler is a new Git client that enhances developer workflow by enabling seamless multitasking and efficient version control management. Unlike traditional Git clients, GitButler introduces the concept of "virtual branches," allowing developers to work on multiple branches simultaneously within the same working directory. This approach minimizes context switching and branch creation, streamlining the development process.
Traditional Git Workflow v/s GitButler flow
Scenario: You are working on a feature, and a critical bug appears in production. This bug needs to be tackled now.
Traditional Git Workflow
- You switch branches (like feature-1, bugfix-2, etc.) whenever you work on something new.
- This means you must keep changing the state of your code, stash changes, or commit early to switch tasks.
- It can get messy if you’re working on multiple things at the same time.
GitButler Flow
- You stay on one base branch (such as primary or development).
- You create virtual branches for each task without switching to a different code base.
Trunk-based development involves working on a single branch, typically the primary or master branch, and avoiding the creation of long-lived feature branches. However, there are some common fears that prevent developers from pushing to the central and adopting trunk-based development:
- Breaking the build. Since we need to commit to the master as regularly as possible, we might push unfinished code or bugs.
- Code isolation: Pushing unfinished code can pollute the entire codebase by introducing regressions and breaking other features.
How does GitButler help?
GitButler provides the concept of virtual branches.
A virtual branch is a local, lightweight representation of a line of work (such as a feature or bug fix), tracked by GitButler, but not an actual Git branch until you decide to push it.
They,
- Exist only on your machine.
- Track changes automatically by context (e.g., file paths, commit messages).
- Let you work on multiple features or fixes in parallel without creating Git noise.
GitButler supports, but does not enforce, trunk-based development.
What does GitButler do?
- Enables clean, local isolation of changes (via virtual branches).
- Makes it easier to work on small, atomic units of work.
- Helps you manage multiple tasks in parallel without polluting your Git repo.
- Simplifies preparing code for integration, whether that involves a direct push or a pull request (PR).
- Encourages local-first, fast-moving workflows.
- Lowers the barrier to short-lived branches and atomic commits.
What does GitButler not do?
- It does not force direct commits to the main branch.
- It still requires you to push changes and optionally open PRs, which can become long-lived branches unless your team is disciplined.
- It doesn’t replace a cultural or process commitment to continuous integration.
Getting started with GitButler
- Install GitButler and sign in.
- You will get this screen.

- Clone the repository using the standard Git Bash.
- Once done, click on ‘Add new project’ and select the one that you have just cloned.

- For best use of the tool, enable both options. For the second one, ensure your repository is on GitHub, as it will prompt you to authorize on GitHub.
- The second option will not work if your repo is on Azure. Once done, click on ‘Let’s go’.
- Once all setup is completed, you will get the following screen.

- From here, you can open VS Code and start working or create a new ‘virtual branch’
- As soon as you create some files in VS Code, a new virtual branch is automatically created in GitButler.

- In VS Code, I have just created the index.html, index.css, and index.js. If you have authorized the GitHub feature, you can drag and drop files to generate a pull request (PR) directly. If not, you can create your PR as usual. For the sake of the demo, I will focus on the virtual branches and push the initial files directly.
- After merging the initial files into the main branch and completing the PR, use GitButler and click on the refresh icon next to ‘Trunk’ in the left pane. You will see the following.

- Click on ‘merge into common branch’ to update. By doing so, your ‘Workspace’ will be automatically updated and contain the latest changes.
The initial setup is done. Let’s get started with virtual branches.
Step 1. Begin writing the HTML code for the calculator app.
After typing and saving the first line, a new virtual branch is created automatically.

When you click on the changes in ‘Changed files’, a new pane will open with the changes made.
















Join the conversation! Your thoughts help the community grow.