NBDiff: A diffing and merging tool for the IPython Notebook
Compare cells, not JSON.
Resolve merge conflicts without a headache.
Local or on the Web
Use NBDiff locally or use the (coming soon!) web service.
NBDiff is under construction by a team of students:
- Shurouq Abusalah
- Tavish Armstrong
- Marwa Malti
- Lina Nouh
- Boris Pipev
- Selena Sachdeva
- Richard Tang
(With a lot of help from our friends at Software Carpentry