Ecosyste.ms: Awesome

An open API service indexing awesome lists of open source software.

awesome-merge-drivers

List of great merge drivers for git and other version control tools
https://github.com/jelmer/awesome-merge-drivers

Last synced: 2 days ago
JSON representation

All-in-one merge drivers
- **Plume-lib merging** - Version numbers; Java imports and annotations; and more
- **smartmerge**
- **smartmerge**
- **Mergiraf** - Java, Rust, Go, Javascript, C, C++, C#, JSON, HTML, XML, YAML and growing
Per-File Merge Drivers
- **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](https://www.gnu.org/software/gettext/))
- **pom-merge-driver** - Maven POM files
- **spork** - Java files
- **jdime** - Java files
- **DMFO** - Word .doc and .docx files
- **Unity SmartMerge** - Unity scene and prefab files
- **dpkg-mergechangelogs** - Debian changelog 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
- **FSTmerge / s3m** - Java files
- **jsFSTMerge** - Javascript files
Documentation
- **Defining a custom merge driver**

Programming Languages