Mergiraf: syntax-aware #merging for #Githttps://lwn.net/Articles/1042355/
Mergiraf: syntax-aware merging for Git The idea of automatic syntax-aware merging in version-control systems goes back to 2005 or ea [...]
@frankel@mastodon.top @frankel@mastodon.top @frankel@mastodon.top