cdcasey/weaver

Rust0 stars0 forks

What it does

Weaver is a 3-way git merge tool that simplifies conflict resolution using a tree-sitter-powered 'magic wand'. It enhances the merging experience by auto-resolving structurally independent changes, making it easier for developers to manage code conflicts.

Star history

Not enough history yet — 1 day(s) recorded. The daily snapshot builds this up.

Tracking

Last trending: 2026-02-21

Creator kit

Hook

Struggling with git merge conflicts? Discover Weaver, the tool that makes resolving them a breeze with its magic wand feature!

Content angles

A tutorial on how to integrate Weaver into your git workflow.
Comparative analysis of Weaver vs traditional merge tools: benefits and drawbacks.
Exploring the magic wand feature: how tree-sitter enhances conflict resolution in Weaver.

Who should care

Developers and software engineers looking for efficient tools to manage git merge conflicts.