GIT-NBMERGEDRIVER(1)

πŸ“¦
version 4.0.4 Β· 2 versions
, in fedora 43, fedora 44

πŸ’– NAME πŸ’–

git-nbmergedriver β€” a git merge driver for notebooks, bestie ✨


πŸŽ€ DESCRIPTION πŸŽ€

okay so picture this: you've got a notebook, you've got a merge conflict, and git is about to hand you a giant wall of raw JSON to hand-fix. absolutely not. πŸ™…β€β™€οΈ

Here's the whole vibe β€” the usage looks like this:

git-nbmergedriver [-h] [--version] [--config] [--log-level {DEBUG,INFO,WARN,ERROR,CRITICAL}] {merge,config} ...

A git merge driver for notebooks. that's the whole thing, that's the girl. πŸ‘‘

It uses nbdime to merge notebooks instead of plain text merges of JSON. so instead of git crying over braces, nbdime actually understands your cells. literally iconic. πŸ’…

heads up though β€” this requires the following to be set in .gitattributes so it can correctly identify filetypes with the driver:
*.ipynb
       merge=jupyternotebook

no cap, if that's not in there it just won't know what to do with your .ipynb files. set it up, thank yourself later. 🫢

Enable it in your global git config with:

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

Use it with:

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

that's it. that's the workflow. go off. 🌈

πŸ¦‹ positional arguments

  • {merge,config} β€” pick your fighter: merge or config. those are the two moves. 🎯

✨ options

  • -h, --help β€” shows this help message and then dips. ✌️
  • --version β€” shows the program's version number and exits. quick lil flex. πŸ“Œ
  • --config β€” lists the valid config keys and their current effective values. a full rundown of what's actually set rn. 🧾
  • --log-level {DEBUG,INFO,WARN,ERROR,CRITICAL} β€” sets the log level by name. pick how chatty you want it to be, from DEBUG (spills everything) all the way to CRITICAL (only the big stuff). πŸ”₯

that's the whole page, and it's from git-nbmergedriver 4.0.4, dated February 2026 β€” so you know it's fresh πŸ’– mwah, go merge some notebooks, you got this πŸŽ€βœ¨

πŸ“¦ where this page comes from