<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Is there anything like Semantic Merge
(<a class="moz-txt-link-freetext" href="https://www.semanticmerge.com/">https://www.semanticmerge.com/</a>) that understands something simpler
like JSON?<br>
<br>
Still eagerly awaiting them adding support for Python.<br>
<br>
Oh, and this is my first email to the list, hello everyone!<br>
<br>
Regards,<br>
Michael<br>
<br>
<br>
<div class="moz-cite-prefix">On 03/06/2015 10:32 AM, Thomas Kluyver
wrote:<br>
</div>
<blockquote
cite="mid:CAOvn4qjMXWXApOf-+rrFbVcm2nya_t0GV-o7aEDFTa=9vtjkNg@mail.gmail.com"
type="cite">
<p dir="ltr">On 6 Mar 2015 01:47, "Maximilian Albert" <<a
moz-do-not-send="true"
href="mailto:maximilian.albert@gmail.com">maximilian.albert@gmail.com</a>>
wrote:<br>
> 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.</p>
<p dir="ltr">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.</p>
<p dir="ltr">> But I'm wondering what sort of future direction
you core devs have in mind for dealing with "semantic"
diffing/merging of notebooks.</p>
<p dir="ltr">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.</p>
<p dir="ltr">Thomas</p>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
IPython-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:IPython-dev@scipy.org">IPython-dev@scipy.org</a>
<a class="moz-txt-link-freetext" href="http://mail.scipy.org/mailman/listinfo/ipython-dev">http://mail.scipy.org/mailman/listinfo/ipython-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Michael Borysow, Ph.D.
Engineering Scientist
The University of Texas at Austin
Applied Research Laboratories
<a class="moz-txt-link-abbreviated" href="mailto:borysow@arlut.utexas.edu">borysow@arlut.utexas.edu</a>
(512) 835-3396
</pre>
</body>
</html>