robinm<p><span class="h-card" translate="no"><a href="https://mamot.fr/@mdk" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>mdk</span></a></span> I'm using [mergiraf](mergiraf.org/) since about 2 months. It's has much fewer false positive than the default line based merge algorithm, but a bit more false negative. It does use tree sitter to compare and merge, a bit like what [difftastic](difftastic.wilfred.me.uk/) does for diffing files.</p><p><a href="https://fosstodon.org/tags/treesitter" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>treesitter</span></a> <a href="https://fosstodon.org/tags/mergiraf" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>mergiraf</span></a> <a href="https://fosstodon.org/tags/difftastic" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>difftastic</span></a></p>