mergiraf

Mergiraf: syntax-aware merging for Git

Nov 13, 2025 Lobste.rs

LWN.net News from the source ContentWeekly EditionArchivesSearchKernelSecurityEvents calendarUnread commentsLWN FAQWrite for us EditionReturn to the Front page User: Password: |…

Mergiraf – syntax-aware git merge driver

Oct 14, 2025 Lobste.rs

Are you held back by conflicts? Then meet Mergiraf Mergiraf can solve a wide range of Git merge conflicts. That’s…