BranchMaster

Easily merge your branches together. BranchMaster lets you manage your chats, branches, and worktrees in one place.

BranchMaster app showing Codex chats, branches, worktrees, changed files, and Git history

Features

  • Easily merge your agents

    It's easy to spin up 100 AI worktrees, but merging them back together is hard. BranchMaster was built to fix that. Commit, branch, merge, update main, and push without leaving the app.

  • Everything on a single page

    View all your branches, chats, and agents.

  • Git power tools

    Access power tools like one-click merge, simplified push and pull, and moving branches by simply dragging.

  • Auto-sync

    See where every chat lives on your Git tree. BranchMaster auto-detects your local chats and Git changes.

  • Built-in safety checks

    We have strong automatic safety checks when you delete branches, switch HEAD, and more, to make sure you don't lose an important commit.

Answer questions like:

  • Which chats still need to be merged in?
  • Which agents have changes to review?
  • Which chats are on which branches?

FAQs

  • What are BranchMaster's core features?

    BranchMaster is a Git visualizer that also:

    - Shows you where your agents are.

    - Suggests actions to take like commit/merge/push.

  • How should I use it?

    Start a bunch of parallel worktrees in Codex. When you're ready to merge them, open BranchMaster and switch to a branch by double clicking. Then follow the suggestions in the Graph column to branch, commit, merge, and push.

  • What AI tools does it support?

    Codex and OpenCode. We may support more tools in the future.

Save time in Codex

There's a better way to manage your branches and worktrees.