Mergiraf: a syntax-aware merge driver for Git(mergiraf.org)
394 points by p4bl0 | 81 comments
Documentation homepage for Mergiraf, a syntax-aware Git merge driver that resolves merge conflicts using knowledge of language syntax trees.
#syntax-aware on Hacker News
1 story tagged syntax-aware, newest first.