merge-driver
There are 5 repositories under merge-driver topic.
jupyter/nbdime
Tools for diffing and merging of Jupyter notebooks.
Praqma/git-merge-driver
Example of how to configure a custom git merge driver
jelmer/awesome-merge-drivers
List of great merge drivers for git and other version control tools
emosheeep/lockfile-conflicts
A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.
charpeni/merge-drivers-cli
A command-line interface to conveniently manage custom git merge drivers.