Live data from Hacker News

Weave – A language aware merge algorithm based on entities

github.com

121–123 of 123 posts

Re: Weave – A language aware merge algorithm based on entities

#121
post #58

How does it compare to https://mergiraf.org/ ? I've had good experience with it so far, although I rarely even need it. It's also based on treesitter, but probably otherwise a more baseline algorithm. I wonder if that "entity-awareness" actually then brings something to the table in addition to the AST. edit: man, I tried searching this thread for mention of the tool for a few times, but apparently its name is not me…

Didn't get what you are saying with mergigraf? I actually did mention about the granularity on which weave works on, in the X thread

Re: Weave – A language aware merge algorithm based on entities

#122

Earlier quoted context omitted.

This is the right question. Storing ASTs directly would make all of this native instead of layered on top. The pragmatic reason weave works at the git layer: adoption. Getting people to switch merge drivers is hard enough, getting them to switch VCS is nearly impossible. So weave parses the three file versions on the fly during merge, extracts entities, resolves per-entity, and writes back a normal file that git stor…

I would love it if sem was hooked up into a PR review UI...

Built something cool that might interest you, semantic diffs

https://x.com/i/status/2029992315532759435

Post reply on HN