This is similar to my approach with all logic in a .py module and then the notebook is only for presentation, comments, and formatting. This works out fine with

This is similar to my approach with all logic in a .py module and then the notebook is only for presentation, comments, and formatting. This works out fine with everything in git and it’s pretty rare to actually have a conflict in the .ipynb.