Nbdev v2.0.7: automatically fix git conflicts

nbdev
1

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 :sparkler:

Previously, you would run git merge, encounter a conflict, then manually run nbdev_fix… now it’s all automatic!

How to use

  1. Upgrade nbdev
  2. Run nbdev_install_hooks in your repo
  3. Profit!

By the way, you can help us test features like this before they’re released by installing nbdev master branch directly from GitHub.

2 Likes