git-nbmergedriver - Man Page

usage: git-nbmergedriver [-h] [--version] [--config]

[--log-level {DEBUG,INFO,WARN,ERROR,CRITICAL}]

{merge,config} ...

A git merge driver for notebooks.

Uses nbdime to merge notebooks instead of plain text merges of JSON. Note that this requires the following to be set in .gitattributes to correctly identify filetypes with the driver:

*.ipynb

merge=jupyternotebook

Enable in your global git config with:

git-nbmergedriver config --enable [--global | --system]

Use with:

git merge [<commit> [<commit>]]