Ataraxy-Labs

Ataraxy-Labs / weave

Public

Entity-level semantic merge driver for Git. Resolves conflicts that git can't by understanding code structure via tree-sitter. 31/31 clean merges vs git's 15/31.

ataraxy-labs.github.ioweave ai-agents conflict-resolution developer-tools git mcp
73
4
100% credibility
Found Feb 11, 2026 at 48 stars -- GitGems finds repos before they trend. Get early access to the next one.
Sign Up Free
AI Analysis
Rust
AI Summary

Weave is a Git merge driver that intelligently resolves code conflicts at the entity level (functions, classes) across multiple languages, eliminating false positives from line-based merging.

How It Works

1
🕵️ Discover Weave

You're frustrated when Git creates conflicts from harmless changes like adding different functions to the same file.

2
📥 Install Weave

Grab it with a quick one-line install command – it's ready in seconds.

3
🔧 Set up in your project

Run a simple setup command inside your project folder to activate smart merging.

4
🔍 Preview your next merge

Peek ahead to see exactly how a merge between branches will go, spotting any real issues early.

5
🔗 Merge branches smoothly

Watch Git combine your team's changes automatically, skipping fake conflicts for independent edits.

🎉 Code without interruptions

Your team now merges code effortlessly, focusing on building instead of fixing needless conflicts.

Sign up to see the full architecture

4 more

Sign Up Free

Star Growth

See how this repo grew from 48 to 73 stars Sign Up Free
Repurpose This Repo

Repurpose is a Pro feature

Generate ready-to-use prompts for X threads, LinkedIn posts, blog posts, YouTube scripts, and more -- with full repo context baked in.

Unlock Repurpose
AI-Generated Review

What is weave?

Weave is a Rust-based Git merge driver that performs entity-level merges on code structure—functions, classes, JSON keys—using tree-sitter parsers, unlike Git's line-based approach. It auto-resolves false conflicts when devs or AI agents edit independent parts of the same file, delivering 31/31 clean merges vs Git's 15/31 in benchmarks. Setup via CLI integrates it into repos for TS/JS/Python/Go/Rust/JSON/YAML/TOML/MD; preview dry-runs merges, status tracks claims.

Why is it gaining traction?

Stands out from gitops tools or wandb weave github integrations by slashing spurious conflicts in multi-branch edits, with entity-aware markers like "function 'foo' both modified" for real issues. Preview and bench commands let you test instantly—no full commit needed. Complements weave extensions or weave github integration without overlapping weave net github networking or weave scope github monitoring.

Who should use this?

AI agent teams building codebases where multiple bots tweak the same modules, like weaver workflows in robotics github or gitops pipelines. Collaborative monorepo devs hitting Git halts on adjacent changes, not weaver syndrom edge cases or weaves crafts like weavers of ireland. Avoid if you're solo or on weave deutsch localization projects.

Verdict

Promising for agent-driven dev with strong benchmarks and CLI, but early at 19 stars and 1.0% credibility—docs solid, tests via bench, yet unproven at scale. Run `weave-cli preview` on a conflicted branch first; adopt if it cleans your merges.

(187 words)

Sign up to read the full AI review Sign Up Free

Similar repos coming soon.