News for hackers. Stuff that matters.

A comment on Mergiraf: a syntax-aware merge driver for Git.

Re:Mergiraf: a syntax-aware merge driver for Git by ctenb on Saturday November 09, 2024 @09:38AM (#42094648)
Would it be possible to make this work with a treesitter grammar?
[ Parent | on HN ]
Re:Mergiraf: a syntax-aware merge driver for Git by wetneb on Saturday November 09, 2024 @09:39AM (#42094653)
It's based on tree-sitter indeed: https://mergiraf.org/adding-a-language.html
[ Parent | on HN ]
Re:Mergiraf: a syntax-aware merge driver for Git by froh on Saturday November 09, 2024 @09:41AM (#42094661)
what do you mean?

its treesitter based already:

https://mergiraf.org/architecture.html

[ Parent | on HN ]
Re:Mergiraf: a syntax-aware merge driver for Git by ctenb on Saturday November 09, 2024 @10:40AM (#42094973)
Hm, I failed to notice that, since it is not mentioned in their introduction, and the list of supported languages is fairly small :)
[ Parent | on HN ]