Antonin Delpeuch<p>New blog post: <a href="https://mergiraf.org" rel="nofollow noopener" translate="no" target="_blank"><span class="invisible">https://</span><span class="">mergiraf.org</span><span class="invisible"></span></a>, a syntax-aware merge driver for <a href="https://mamot.fr/tags/Git" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>Git</span></a>.</p><p>Supports <a href="https://mamot.fr/tags/Java" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>Java</span></a>, <a href="https://mamot.fr/tags/Rust" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>Rust</span></a>, <a href="https://mamot.fr/tags/Golang" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>Golang</span></a>, <a href="https://mamot.fr/tags/javascript" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>javascript</span></a>, <a href="https://mamot.fr/tags/cpp" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>cpp</span></a>, <a href="https://mamot.fr/tags/csharp" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>csharp</span></a>, <a href="https://mamot.fr/tags/html" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>html</span></a>, <a href="https://mamot.fr/tags/json" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>json</span></a>, <a href="https://mamot.fr/tags/yaml" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>yaml</span></a> and <a href="https://mamot.fr/tags/xml" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>xml</span></a> so far, and it's quite easy to add support for more thanks to <a href="https://mamot.fr/tags/treesitter" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>treesitter</span></a>.</p><p><a href="https://antonin.delpeuch.eu/posts/mergiraf-a-syntax-aware-merge-driver-for-git/" rel="nofollow noopener" translate="no" target="_blank"><span class="invisible">https://</span><span class="ellipsis">antonin.delpeuch.eu/posts/merg</span><span class="invisible">iraf-a-syntax-aware-merge-driver-for-git/</span></a></p><p>Get it on <a href="https://mamot.fr/tags/Codeberg" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>Codeberg</span></a>: <a href="https://codeberg.org/mergiraf/mergiraf" rel="nofollow noopener" translate="no" target="_blank"><span class="invisible">https://</span><span class="">codeberg.org/mergiraf/mergiraf</span><span class="invisible"></span></a></p>