Yes, nbdev can help with merge conflicts for notebooks [1]. Also checkout,

- GitPlus[2] - JupyterLab extension for git version control

- ReviewNB[3] - For notebooks diffs & commenting

Disclaimer: I built GitPlus & ReviewNB

[1] https://nbdev.fast.ai/#Avoiding-and-handling-git-conflicts

[2] https://github.com/ReviewNB/jupyterlab-gitplus/

[3] https://www.reviewnb.com/

reviewnb looks interesting. cool project.

I use NBDime to make readable diffs of Jupyter notebooks https://nbdime.readthedocs.io/en/latest/

this is exactly what I was looking for. thanks.

Jupytext (https://github.com/mwouts/jupytext) solves most of the problems with managing notebooks in git.

nbdev works with any kernel, because it only cares about the notebook files, which as you know are just JSON.

I've been using it with xeus-python kernel lately.

Edit: Forgot the Git part. It was designed to handle the git limitations in notebooks as well. In fact, one of the commands in the tutorials is to set up it's built-in git hooks, which will run special clean commands on commits.