Read news on aware merge driver with our app.
Read more in the app
Mergiraf: a syntax-aware merge driver for Git