[IPython-dev] nbexplode - experiment in version controlling notebooks

Michael Borysow borysow at arlut.utexas.edu
Fri Mar 6 11:33:42 EST 2015

Is there anything like Semantic Merge (https://www.semanticmerge.com/) 
that understands something simpler like JSON?

Still eagerly awaiting them adding support for Python.

Oh, and this is my first email to the list, hello everyone!


On 03/06/2015 10:32 AM, Thomas Kluyver wrote:
> On 6 Mar 2015 01:47, "Maximilian Albert" <maximilian.albert at gmail.com 
> <mailto:maximilian.albert at gmail.com>> wrote:
> > Would you favour this approach over something like nbdiff [1,2]? 
> Disclaimer: I haven't tried nbdiff yet, just stumbled upon it and 
> thought it looked promising.
> I don't think this is better than nbdiff: it's much worse for a human 
> looking at the diff, but it may allow some more merges to be handled 
> automatically, without manually fixing conflicts. It may even be 
> possible to combine the two, so nbexplode helps the vcs, and nbdiff 
> helps the user when the VCS can't merge automatically.
> > But I'm wondering what sort of future direction you core devs have 
> in mind for dealing with "semantic" diffing/merging of notebooks.
> Write a new VCS? I'm mostly joking, but so long as VCSs are designed 
> for nothing but flat text files, I think storing structured data in 
> them will be kind of hackish.
> Thomas
> _______________________________________________
> IPython-dev mailing list
> IPython-dev at scipy.org
> http://mail.scipy.org/mailman/listinfo/ipython-dev

Michael Borysow, Ph.D.
Engineering Scientist
The University of Texas at Austin
Applied Research Laboratories
borysow at arlut.utexas.edu
(512) 835-3396

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/ipython-dev/attachments/20150306/066c07ad/attachment.html>

More information about the IPython-dev mailing list