[IPython-User] ipython notebooks and collaboration: diff & merge ?

Aaron Meurer asmeurer@gmail....
Fri Dec 14 20:28:35 CST 2012


You could play with writing a proper .gitattributes entry for .ipynb
files, so that git diff is smarter.

Aaron Meurer

On Thu, Dec 13, 2012 at 12:50 AM, Matthias BUSSONNIER
<bussonniermatthias@gmail.com> wrote:
>
> Le 13 déc. 2012 à 05:11, Adam Ginsburg a écrit :
>
>> I've been using ipython notebooks with github as a teaching tool.
>> I've written up ipython notebooks with blanks in them and ask the
>> students to fill in those blanks as part of the assignment.  It works
>> nicely as an interactive "lecture" + tutorial.
>>
>> I've also been using git (via github) to distribute the notebooks.
>>
>> However, I've come across a problem - sometimes, I need to send the
>> students updated notebooks, but they've already made some changes and
>> saved their notebooks.  When I send them the new code, they get merge
>> conflicts, and the conflicts are pretty messy (dozens of annoying,
>> trivial ones because cell numbers have changed, much more daunting
>> ones when images are involved).
>>
>> My students don't really know how to merge documents.  I'm not much of
>> a merging expert myself.  Is there a nice way to merge ipython
>> notebooks, say based only on inputs (in order to ignore output
>> images)?  Are there any particular merge/diff tools that handle
>> ipython notebooks well?
>
> There is a short thread on the 18th of november with 1 or 2 prototype of diff tools.
> I think Min has a prototype of manual merging script (i would search on the wiki)
>
> Any Json-diff tool can be of help.
>
> But we will get to that.
>
> Thanks.
> --
> Matthias
>
>
> _______________________________________________
> IPython-User mailing list
> IPython-User@scipy.org
> http://mail.scipy.org/mailman/listinfo/ipython-user


More information about the IPython-User mailing list