Remix.run Logo
_flux 10 hours ago

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 mergigraf

rs545837 9 hours ago | parent [-]

Actually tackled it here: https://x.com/rs545837/status/2021423280410988580

Cheers,

_flux 9 hours ago | parent [-]

I think it would be interesting to include it in the comparison table, as I think it could be viewed as a base line language-aware merge tool.

rs545837 9 hours ago | parent [-]

what kind of compariosn table are you looking for? I actually added that on the website https://ataraxy-labs.github.io/weave/