Subj : [$] Mergiraf: syntax-aware merging for Git
To   : All
From : LWN.net
Date : Fri Oct 31 2025 19:30:09

[$] Mergiraf: syntax-aware merging for Git

Date:
Fri, 31 Oct 2025 19:30:00 +0000

Description:
The idea of automatic syntax-aware merging in version-control systems goes 
back to 2005 or earlier , but initial implementations were
often language-specific and slow. Mergiraf is a merge-conflict resolver that 
uses a generic algorithm plus a
small amount of language-specific knowledge
to solve conflicts that Git's default strategy cannot.
The project's contributors have been working on the
tool for just under a year, but it already supports 33 languages , including 
C,
Python, Rust, and even SystemVerilog .

======================================================================
Link to news story:
https://lwn.net/Articles/1042355/


--- Mystic BBS v1.12 A49 (Linux/64)
 * Origin: tqwNet UK HUB @ hub.uk.erb.pw (1337:1/100)

.