Tools for diffing and merging of Jupyter notebooks.

Example of how to configure a custom git merge driver

Entity-level semantic merge driver for Git. Resolves conflicts that git can't by understanding code structure via tree-sitter. 31/31 clean merges vs git's 15/31.

backup: https://codeberg.org/mergiraf/mergiraf

List of great merge drivers for git and other version control tools

A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.

Git merge driver for resolving lockfile conflicts in npm v7.0.0+

A command-line interface to conveniently manage custom git merge drivers.