Ataraxy-Labs/weave
View on GitHub ↗ ★ 1,341 Rust
Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.
9 mentions on Hacker News by 8 people: 2 stories, 7 comments · first 2026-02-11 · latest 2026-06-14
20082026
-
…that wouldn't go away no matter how many issues I filed. Unacceptable. Had to disable it. https://github.com/Ataraxy-Labs/weave/issues?q=is%3Aissue%20... Be warned.
comment by igravious · 2026-06-14 · in Weave: Merging based on language structure and not lines -
…on something like this in a similar space but for source code, therefore built a tool called Weave( https://github.com/Ataraxy-Labs/weave ) for entity level merges for git. Instead of merging lines of text, it extracts functions, classes,…
comment by rs545837 · 2026-04-21 · in A type-safe, realtime collaborative Graph Database in a CRDT -
Looks similar to sem/weave https://github.com/ataraxy-labs/sem https://github.com/ataraxy-labs/weave Though, despite the claims, I am not sure if these are ready for prime-time yet. I have noticed some rather concerning merge "resolutions".
comment by 22c · 2026-03-20 -
that's pretty cool, thank you worth mentioning that mergiraf is already supported for windows. from https://github.com/Ataraxy-Labs/weave/issues/7 it looks like it's planned for weave too at some point?
comment by bigcojosh · 2026-03-04 · in Weave – A language aware merge algorithm based on entities -
He also was pushing code to a branch on the same repo three weeks ago: https://github.com/Ataraxy-Labs/weave/commits/fix/utf8-panic... but is acting in this post like he just discovered the project.
comment by duskdozer · 2026-03-04 · in Weave – A language aware merge algorithm based on entities -
…of this repo as well. You made a pull request not from your own fork, but from a separate branch, https://github.com/Ataraxy-Labs/weave/pull/9
comment by Erlangen · 2026-03-04 · in Weave – A language aware merge algorithm based on entities -
https://github.com/Ataraxy-Labs/weave/pull/11 Dude did you just call me AI generated haha, i've been actively using weave for a gui I've been building for blazingly fast diffs https://x.com/Palanikannan_M/status/2022190215021126004 So…
comment by Palanikannan · 2026-03-04 · in Weave – A language aware merge algorithm based on entities -
▲ 188
Weave – A language aware merge algorithm based on entitiesstory by rs545837 · 2026-03-04 · 113 comments
-
▲ 2
Weave, an entity-level semantic merge driver for Gitstory by pbowyer · 2026-02-11 · 0 comments