github.com/Ataraxy-Labs/weave (link)

commit signals (19)

source signals (2)

• SKILL.mdvia unspecified

  # weave
  
  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.
  
  ## Setup
  
  ```bash
  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, 

• docs/llms.txtvia unspecified

  # weave
  
  > Entity-level semantic merge driver for Git. Resolves conflicts at the function and class level using tree-sitter.
  
  ## Overview
  
  weave replaces git's line-level merge with entity-level merge. It parses all three versions (base, ours, theirs) with tree-sitter, extracts functions/classes/methods, matches them by name and structural hash, and merges per-entity instead of per-line.
  
  Two developers editing different functions in the same file? No conflict. Git would flag this as a conflict because the 

ignorefile signals (0)

none