nbdev v2.0.7 just released with more git-friendly notebook goodness. Merge conflicts in cell outputs are now automatically fixed, and code conflicts are split into separate notebook cells
Previously, you would run
git merge, encounter a conflict, then manually run
nbdev_fix… now it’s all automatic!
- Upgrade nbdev
nbdev_install_hooksin your repo
By the way, you can help us test features like this before they’re released by installing nbdev
master branch directly from GitHub.