Loading skill
Install any skill in seconds. Free to start, no credit card required.
Get Started Free →ataraxy-labs/weave
Entity-level semantic merge driver for Git. Resolves conflicts at the function/class level instead of lines.
Passed 23 of 23 test cases with the skill, and 8 of 23 without it.
and 12 more in the full report
15 fixed8 passed either way0 still failing0 broke1 errored
Tokens, turns and time describe resource use, not a dollar price.
This benchmark measured an earlier version of the skill.
A newer attempt on gemini-3.8-flash on 10/19/2026 did not produce a publishable comparison (not comparable). The snapshot above is the previously measured run.
One of 15 test cases the skill fixed. Same model, same prompt, with and without the skill.
We launch `weave-mcp` as a background process from outside our target git repository directory. Which environment variable explicitly specifies the target git repository path?
| Checked | Without skill | With skill |
|---|---|---|
| Recommends setting the `WEAVE_REPO` environment variable. | Missed | Passed |
The instructions your model reads when the skill loads.
Entity-level semantic merge driver for Git. Resolves conflicts at the function/class level instead of the line level, so two changes to different functions in the same file never conflict.
weave setup # this repo: registers weave as the merge driver + .gitattributes
weave setup --global # every repo on this machine, no per-repo step
weave setup --local # this repo only, writes .git/info/attributes instead
weave setup auto-detects the weave-driver binary, writes
merge.weave.driver to git config, and adds *.ts merge=weave (etc.) for
every supported extension. The equivalent by hand, if you need it:
git config merge.weave.name "Entity-level semantic merge"
git config merge.weave.driver "weave-driver %O %A %B %L %P"
echo '*.py merge=weave' >> .gitattributes # repeat per extension you want covered
After setup, git merge / git rebase / git cherry-pick all route through
weave automatically. No new commands to run to get a merge — only to resolve
one that still conflicts.
Most merges finish clean with no conflict markers. When one entity is genuinely disputed by both sides, weave leaves a marker box like git's, plus one line stating why:
<<<<<<< ours — function `process` (T, confidence: high)
// refused_by: statement_fold · collision: ` return data.upper()` +1 more
def process(data):
return data.upper()
=======
test cases passed, vs 8 / 23 without
More skills from the same source and nearby in the registry, with their headline benchmark lift.