(This is a stripped-down version of the news letters sent out to members of...| blog.codeberg.org
A syntax-aware git merge driver for a growing collection of programming languages and file formats.| mergiraf.org
A central feature of Git is the ability to merge the contents of diverging revisions. It underpins not just the git merge command, but also rebase, cherry-pick and revert for instance. Without it, no collaboration would be possible. And it generally works great.| antonin.delpeuch.eu