edmundmiller/dotfiles/weave

# Configure current repo
weave setup
 
# Preview merge quality before merging
weave preview <branch>
 
# Execute merge (after setup, git uses weave driver)
git merge <branch>
 
# Optional: inspect CRDT state if using claims
weave status

# 1) binaries present
command -v weave weave-driver weave-mcp
 
# 2) repo config present
git config --local --get-regexp '^merge\.weave\.'
 
# 3) attributes include merge=weave
grep -n 'merge=weave' .gitattributes

merge.weave.name Entity-level semantic merge
merge.weave.driver weave-driver %O %A %B %L %P

tmpdir=$(mktemp -d) && cd "$tmpdir"
git init -q
git config user.name test && git config user.email test@example.com
cat > lib.ts <<'EOF'
export function a(x:number){ return x*2 }
export function b(s:string){ return s.length>0 }
EOF
git add lib.ts && git commit -qm base
weave setup >/dev/null
 
git checkout -qb left
perl -0pi -e 's/x\*2/x*3+1/' lib.ts
git commit -am left -q
 
git checkout -q @{-1}
git checkout -qb right
perl -0pi -e 's/s\.length>0/s.trim().length>0/' lib.ts
git commit -am right -q
 
git checkout -q left
git merge --no-ff right