nbdime
Tools for diffing and merging of Jupyter notebooks
...It understands the structure of notebook documents. Therefore, it can make intelligent decisions when diffing and merging notebooks. Many of us who are writing and sharing notebooks do so with git and GitHub. Git doesn’t handle diffing and merging notebooks very well by default, but you can configure git to use nbdime and it will get a lot better.