Entity-level merge for worktree branches #44
Description
When running multiple agents in parallel via dmux, merging their worktree branches back often creates false conflicts. Two agents editing different functions in the same file triggers a git conflict that shouldn't exist.
Weave is a semantic merge driver that merges at function/class level instead of lines. Resolves 100% of a 31-scenario benchmark cleanly vs git's 48%.
Installs as a git merge driver (one line in .gitattributes per file type). dmux could auto-configure this when creating worktrees so merges just work better out of the box.
*.ts merge=weave
*.py merge=weave
*.js merge=weave
brew install ataraxy-labs/tap/weave && weave install
Happy to help if this is interesting.