[ANN] nbdime 0.1

[MinRK]

We’ve made our first release of nbdime: 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 if you have issues. And please send us notebooks that don’t merge, or merge poorly.

See the docs for details.

-Min

​

[Brian Granger]

Fantastic, I know a ton of work went into this over a long period of
time. Huge accomplishment!

Cheers,

Brian

> --
> 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+u...@googlegroups.com.
> To post to this group, send email to jup...@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.



--
Brian E. Granger
Associate Professor of Physics and Data Science
Cal Poly State University, San Luis Obispo
@ellisonbg on Twitter and GitHub
bgra...@calpoly.edu and elli...@gmail.com

[Damián Avila]

Lovely stuff! Congrats one the release!

> email to jupyter+unsubscribe@googlegroups.com.

> To post to this group, send email to jup...@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.

--
Brian E. Granger
Associate Professor of Physics and Data Science
Cal Poly State University, San Luis Obispo
@ellisonbg on Twitter and GitHub
bgra...@calpoly.edu and elli...@gmail.com

--
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+unsubscribe@googlegroups.com.

To post to this group, send email to jup...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/jupyter/CAH4pYpR4OA-i0yR4MpJfqmbNbZHGuKQqoT837fLdFKCMMUNKiw%40mail.gmail.com.

For more options, visit https://groups.google.com/d/optout.

--

Damián Avila

[Fernando Perez]

Indeed, seems like we're on a release roll! Awesome :)

BTW, let's make sure these new releases make it prominently onto the newsletter, so that folks who only get those higher-level updates are aware of the progress...

To view this discussion on the web visit https://groups.google.com/d/msgid/jupyter/CAH%2BmRR1eBNTE-biv7VHqaPa9yLT%2BKp5kyY4LZMUS9pNQP%3Dh%3DeA%40mail.gmail.com.

For more options, visit https://groups.google.com/d/optout.

--

Fernando Perez (@fperez_org; http://fperez.org)
fperez.net-at-gmail: mailing lists only (I ignore this when swamped!)
fernando.perez-at-berkeley: contact me here for any direct mail