Fantastic, I know a ton of work went into this over a long period of time. Huge accomplishment!
Cheers, Brian On Fri, Dec 16, 2016 at 8:09 AM, MinRK <[email protected]> wrote: > 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 > > -- > 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 [email protected]. > To post to this group, send email to [email protected]. > 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 [email protected] and [email protected] -- 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 [email protected]. To post to this group, send email to [email protected]. 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.
