I pull out difftastic when it’s all too hard for this. Diffs based off tree sitter
Don't forget mergiraf, for tree-sitter-based conflict resolution:
https://mergiraf.org/
alt Hacker News
Don't forget mergiraf, for tree-sitter-based conflict resolution:
https://mergiraf.org/