4 ms·
How does it compare to https://mergiraf.org/ https://mergiraf.org/ ? I've had good experience with it so far, although I rarely even need it. It's also based o
by _flux 7mo ago
How does it compare to https://mergiraf.org/ 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 7mo agoActually tackled it here: https://x.com/rs545837/status/2021423280410988580 https://x.com/rs545837/status/2021423280410988580 Cheers,
- _flux 7mo agoI 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 7mo agowhat kind of compariosn table are you looking for? I actually added that on the website https://ataraxy-labs.github.io/weave/ https://ataraxy-labs.github.io/weave/
- bigcojosh 7mo agothat's pretty cool, thank you worth mentioning that mergiraf is already supported for windows. from https://github.com/Ataraxy-Labs/weave/issues/7 https://github.com/Ataraxy-Labs/weave/issues/7 it looks like it's planned for weave too at some point?
- rs545837 7mo agoYeah 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.
- rs545837 7mo agoDidn't get what you are saying with mergigraf? I actually did mention about the granularity on which weave works on, in the X thread