Braidkeep is an open-source developer tool designed to catch merge conflicts before parallel AI coding agents break your repository's primary branch. When running multiple AI agents simultaneously, their respective git branches often collide at merge time—frequently forcing developers to discover and resolve conflicts one by one after all agents have finished running.

Braidkeep solves this by predicting potential conflicts between in-flight branches before merges take place. It utilizes Git's native merge-tree functionality in a read-only manner, ensuring your active working tree is never touched or modified. Key features of Braidkeep include:

Conflict Prediction: Leverages Git's merge-tree to detect collisions early across active branches.
File Ownership Enforcement: Enforces per-agent file ownership to prevent overlapping edits.
Safe Merge Ordering: Computes an optimal merge order, prioritizing conflict-free batches first and placing entangled branches last.
Flexible Integration: Functions as a single binary under an Apache-2.0 license, allowing it to work with any agent orchestrator.

Note: Braidkeep is specifically designed to predict code mergeability, not code correctness or functional accuracy.

Pros of Braidkeep

Free and open-source under the Apache-2.0 license
Uses Git's read-only merge-tree to inspect conflicts without altering your working tree
Enforces per-agent file ownership to reduce overlapping code modifications
Computes optimal merge orders and works with any agent orchestrator as a single binary

Cons of Braidkeep

Predicts mergeability only, not functional correctness of the code
Tailored specifically for branch conflict prediction rather than general code generation

Frequently Asked Questions

What is Braidkeep?

Braidkeep is a free, open-source developer tool designed to predict and manage git merge conflicts between branches created by parallel AI coding agents.