List view
At this milestone we'll have a functional and useful commandline interface for merging of notebooks. At a minimum we should be able to do a three-way merge of notebooks: nbmerge base.ipynb local.ipynb remote.ipynb merged.ipynb in a way that's easy to connect to git. Pending unknown bugs, for may cases this first step is somewhat doable today, but not with quite the quality we want. For this to be actually useful we need a functional way to resolve conflicts.
No due dateAt this milestone we'll have a functional and useful commandline interface for diffing of notebooks. At a minimum we should be able to look at the diff of notebooks: nbdiff a.ipynb b.ipynb and have the output be more useful than a regular text diff: diff a.ipynb b.ipynb To reach this goal some refinement of both the diff computation and presentation is needed.
No due date•2/2 issues closed