Awesome Merge Drivers

Per-File Merge Drivers

1. dpkg-mergechangelogs - Debian changelog files
2. composer - composer.json / composer.lock files
3. nbdime - Jupyter notebooks
4. git-json-merge - Generic JSON merge
5. git-po-merge - GNU gettext po files (a wrapper around msgmerge)
6. pom-merge-driver - Maven POM files
7. git-merge-changelog - GNU ChangeLog files
8. npm-merge-driver - NPM package-lock.json files
9. git-lfs-merge-driver - Git LFS files
10. org-merge-driver - Emacs Org Mode

Documentation

1. Defining a custom merge driver in the official docs

All-in-one merge drivers

1. smartmerge

Meta

License

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