mergiraf is a neat tree-sitter based tool that manages to resolve
merge/rebase conflicts, at least sometimes.

Comment:
syntax-aware git merge driver

Description:
Mergiraf can solve a wide range of Git merge conflicts because it's
aware of the syntax trees in your files. Thanks to its understanding
of your language, it can often reconcile the needs of both sides.

Maintainer: Theo Buehler <tb@openbsd.org>

WWW: https://mergiraf.org/

• mergiraf.tgz (13K)