nbdime is used for diffing and merging Jupyter notebooks. nbdime has an excellent understanding of the structure of notebooks, which allows it to make smart decisions when diffing and merging notebooks. nbdime can encode images for when we print it inside the Terminal and it can also auto-resolve conflicts.