See also https://mergiraf.org/ for a tool that uses ASTs to resolve (some) merge...

		dcre 6 months ago \| parent \| context \| favorite \| on: Diffsitter – A Tree-sitter based AST difftool to g... See also https://mergiraf.org/ for a tool that uses ASTs to resolve (some) merge conflicts.