#55 · Primary category： AI DevOps & SRE Tools
weave
Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.
Project last updated：08/29/26
GitHub Stars
1.3K
Forks
41
Contributors
13
License
Apache-2.0
Why we included this project
Parallel coding agents keep colliding on the same files, and Git's line-based diff often reports a conflict when the edits actually touched unrelated functions. Weave swaps that line matching for an entity-level merge: tree-sitter parses the base, ours, and theirs, so functions and classes get matched by identity. Changes that only look overlapping resolve cleanly, and the README claims roughly a 95% reduction in false conflicts. When a real dispute does surface, the conflict message names the entity at odds rather than pointing at a line range. It covers a broad set of languages and falls back to ordinary merging for anything it can't parse, and it ships an MCP server, which makes it a natural fit for teams running several agents against one repo.
Articles for this project
No articles for this project yet.
To suggest a topic or contribute an article, contact us.
Related projects in this category
harness
Harness Open Source is an end-to-end developer platform with Source Control Management, CI/CD Pipelines, Hosted Developer Environments, and Artifact Registries.
nx
The Monorepo Platform that amplifies both developers and AI agents. Nx optimizes your builds, scales your CI, and fixes failed PRs automatically. Ship in half the time.
jenkins
Jenkins automation server
awx
AWX provides a web-based user interface, REST API, and task engine built on top of Ansible. It is one of the upstream projects for Red Hat Ansible Automation Platform.
dagger
Automation engine to build, test and ship any codebase. Runs locally, in CI, or directly in the cloud