This is a guide on how to merge Jupyter Notebooks (.ipynb) properly
- Install nbdime with
pip install nbdime
- You may also need to install ipython_genutils, with
pip install ipython_genutils
- You may also need to install ipython_genutils, with
Run nbdime merge-web base local remote
, but replace base with your already-merged file, local with the current file, and remote with the upstream changes
Wait for it to process, then click download.