#210210th of 324 in Skills, plugins and prompts

weave

Git merge driver that merges functions and classes instead of lines

Stars
1.3k
License
Apache-2.0
Last commit
Oct 2026
Last release
Oct 2026
Language
Rust
Stars, last 30 weeks+526
3 Apr 2026: 815 stars10 Apr 2026: 882 stars17 Apr 2026: 913 stars24 Apr 2026: 941 stars1 May 2026: 968 stars8 May 2026: 983 stars15 May 2026: 1,000 stars22 May 2026: 1,078 stars29 May 2026: 1,091 stars5 Jun 2026: 1,101 stars12 Jun 2026: 1,119 stars19 Jun 2026: 1,177 stars26 Jun 2026: 1,187 stars3 Jul 2026: 1,192 stars10 Jul 2026: 1,210 stars17 Jul 2026: 1,218 stars24 Jul 2026: 1,224 stars31 Jul 2026: 1,227 stars7 Aug 2026: 1,235 stars14 Aug 2026: 1,246 stars21 Aug 2026: 1,252 stars28 Aug 2026: 1,257 stars4 Sept 2026: 1,265 stars11 Sept 2026: 1,277 stars18 Sept 2026: 1,285 stars25 Sept 2026: 1,300 stars2 Oct 2026: 1,312 stars9 Oct 2026: 1,320 stars16 Oct 2026: 1,324 stars23 Oct 2026: 1,333 stars30 Oct 2026: 1,341 stars

815 on 3 Apr 20261,341 on 30 Oct 2026

From GitHub's daily star counts.

Checked on GitHub.

Overview

Weave registers as a Git merge driver and parses base, ours and theirs with tree-sitter, then merges at the level of functions, classes and keys. Independent additions to the same file resolve without conflict, and real collisions show the entity and the guard that refused. It also has `weave land` for verified merges by agents, an MCP server, and jj support.

Who it is for: Developers running several coding agents or branches that edit the same files

Strengths

  • Entity-level 3-way merge across 38 languages, with line-merge fallback for the rest
  • Conflict markers name the entity and the guard that refused (`refused_by:`)
  • Reproducible benchmarks: `weave stats --bench` and replay of real merge commits
  • Setup per repo, per user or globally; `weave setup --off` reverts

Weaknesses

  • Replay on real repos showed 86 regressions where Git merged cleanly and weave conflicted
  • Human-match rate on wins is 33% on Flask and Go
  • Vue, Svelte, ERB and Haskell fall back to Git's line merge
  • Source install needs two binaries, `weave` and `weave-driver`, both on PATH

What it needs

  • no GPU
  • Needs git, Rust toolchain (source build)

Quick answers

Is weave open source?

Yes. Its code is on GitHub under the Apache-2.0 license.

Also in Skills, plugins and prompts

See all 324
Also in Skills, plugins and prompts
RankProjectScore
1impeccableDesign skill with 24 slash commands for AI coding agents' frontend output Live demo ↗ (opens in a new tab)98.9k starsApache-2.096 out of 100
2skillsAgent skills for planning, TDD, debugging and code review308.9k starsMIT95 out of 100
3eccAgents, skills, hooks and rules bundle for Claude Code, Codex and other harnesses294.5k starsMIT95 out of 100
#4gstackMarkdown slash-command skills that give Claude Code planning, review, QA and ship roles138.5k starsMIT95 out of 100
#5cavemanCuts token use in coding agents with terse replies and compressed inputs Live demo ↗ (opens in a new tab)116.6k starsApache-2.095 out of 100