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
Actually tackled it here: https://x.com/rs545837/status/2021423280410988580
Cheers,
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.
what kind of compariosn table are you looking for? I actually added that on the website https://ataraxy-labs.github.io/weave/
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?
Yeah we are focusing on all these directions, could you also open up issues, if you want some specific things, helps us a lot in tracking issues.
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