We’ve made our first release of nbdime <https://nbdime.readthedocs.io/en/latest/>: tools for diffing and merging notebooks.
pip install --upgrade nbdime Key features: - nbdiff for diffing notebooks in the terminal - nbdiff-web for viewing a rich, rendered diff of two notebooks - nbmerge for merging three notebooks, with automatic conflict resolution that should always guarantee a valid notebook, even with unresolved conflicts - nbmerge-web for manually resolving conflicts when merging notebooks - nbshow for quickly viewing a notebook in the terminal - git integration for using the diff and merge tools on notebook files by default It’s still quite raw, especially the merge conflict resolution, so let us know <http://github.com/jupyter/nbdime/issues> if you have issues. And please send us notebooks that don’t merge, or merge poorly. See the docs <https://nbdime.readthedocs.io/en/latest/> for details. -Min -- You received this message because you are subscribed to the Google Groups "Project Jupyter" group. To unsubscribe from this group and stop receiving emails from it, send an email to jupyter+unsubscr...@googlegroups.com. To post to this group, send email to jupyter@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jupyter/CAHNn8BU0pmb-Y4-fQK5qxy9EL3NX3q%2BPqXwKoZor273avGimKA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
