Resolve git conflicts semantically
SKILLskillsetup L3★1,119
Ataraxy-Labs/weave ↗What it does
Resolve Git merge conflicts at entity level instead of lines
Best for
Teams with frequent parallel edits needing semantic merge without conflict markers.
Inputs
- · two Git branches with conflicts
Outputs
- · conflict-free merged code respecting entity boundaries
Requires
- · Git custom merge driver
- · Rust
Preconditions
weave setup as merge driver
Failure modes
- · entity matching can fail on non-standard code
- · CRDT adds latency vs line merge
Trust signals
- · Cargo workspace structure
- · CRDT theory applied