Tools for diffing and merging of Jupyter notebooks.

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

Example of how to configure a custom git merge driver

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.

Git merge driver that auto-resolves Rails schema version conflicts in db/schema.rb.