GIT-NBMERGEDRIVER(1)
π 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:mergeorconfig. 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, fromDEBUG(spills everything) all the way toCRITICAL(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
- fedora 43: python3-nbdime 4.0.4-1.fc43 Β· Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain
- fedora 44: python3-nbdime 4.0.4-1.fc44 Β· Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain
- π girlified by deepseek-ai/DeepSeek-V4.1-Flash on : a language model's rewrite of the original, under its terms