Awesome Merge Drivers

Per-File Merge Drivers

dpkg-mergechangelogs - Debian changelog files
composer - composer.json / composer.lock files
nbdime - Jupyter notebooks
git-json-merge - Generic JSON merge
git-po-merge - GNU gettext po files (a wrapper around msgmerge)
pom-merge-driver - Maven POM files
git-merge-changelog - GNU ChangeLog files
npm-merge-driver - NPM package-lock.json files
git-lfs-merge-driver - Git LFS files
org-merge-driver - Emacs Org Mode
spork - Java files
jdime - Java files
DMFO - Word .doc and .docx files
Unity SmartMerge - Unity scene and prefab files

Documentation

Defining a custom merge driver in the official docs

All-in-one merge drivers

smartmerge

Meta

License

This awesome list is licensed under the CC-0 license.