nbdime mergetool and nbmerge-web failing, nbmerge ok

[shenberg]

Hiya, thanks for the amazing tool you've made here, even with the issue it's been a massive enabler and time-saver (I managed to work around the issue but it's there).

I'm running nbdime 2.1.0 on homebrew python 3.8.5 on MacOS 10.15.7. and I enabled the git integration globally.

I tried to run the mergetool on a conflicted merge of a notebook, and the browser stayed loading forever. Upon opening the browser's dev-tools, I saw an exception saying Uncaught (in promise) Error: Invalid merge decision, cannot have null base for deleted cell:

This is the same error as is seen in another issue that seems to have been resolved.

I thought the issue may be related to the fact that I'm looking at the merge after-the-fact, so I did as follows:

$ git show HEAD:notebook.ipynb >notebook.head.ipynb
$ git show branch-to-merge:notebook.ipynb >notebook.branch.ipynb
$ git show $(git merge-base HEAD branch-to-merge):notebook.ipynb  >notebook.base.ipynb
$ nbmerge-web notebook.base.ipynb notebook.head.ipynb notebook.branch.ipynb

and I got the same error, so no luck here.

To work around the issue, I ran nbmerge notebook.base.ipynb notebook.head.ipynb notebook.branch.ipynb >notebook.merge.ipynb (note no -web) and manually fixed the merge issues using the regular Jupyter UI.

Is there a way to let me use the fancy web UI next time I'm merging?

[vidartf]

Thanks for the report, and the kind words :)

This will be a lot faster for me to debug and fix if you can share the notebooks (maybe a cleaned up version if the notebooks are not for public sharing in their current form). If that is not possible, the second best thing could be to run the nbmerge command you shared with --decisions flag, and share the (cleaned up) output of that.

[shenberg]

Will do. It contains a bunch of data I can't share, I'll clean it up and post it in a bit.

[jucor]

@shenberg Any luck on this, please? That'd be very helpful :)

[vidartf]

@jucor If you are also having this problem, then you can help by sharing a set of notebooks that replicate the issue.

[jucor]

Happy to. What's a good way to send you the notebooks non-publicly, please?

On Wed, 12 May 2021, 15:32 Vidar Tonaas Fauske, @.***> wrote:

@jucor https://github.com/jucor If you are also having this problem, then you can help by sharing a set of notebooks that replicate the issue.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/jupyter/nbdime/issues/550#issuecomment-839821287, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFBERJJXSPSWUJLE2SUFN3TNKGOVANCNFSM4TI2M32A .

[vidartf]

My email should be in the commit log.

[jucor]

Thanks Vidar. The project has moved so much that I can't find the notebooks that caused this. Next time it happens I'll git tag and send to you!

On Mon, May 17, 2021 at 5:31 PM Vidar Tonaas Fauske < @.***> wrote:

My email should be in the commit log.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/jupyter/nbdime/issues/550#issuecomment-842465238, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFBEROZQ7EV5JWCERG7DRDTOFAGJANCNFSM4TI2M32A .

-- Julien Cornebise, Ph.D. (he/him) Honorary Associate Professor Department of Computer Science University College London https://cornebise.com/julien

[moziada]

Got the same case with the exception Uncaught (in promise) Error: Currently not able to handle decisions on variable "id" within browser's dev-tools, any luck yet resolving the issue?

[vidartf]

Closing this with the ID issue tracked in #690.

[vidartf]

(if somebody else is experiencing this issue, please comment here or open another issue, ideally with some notebooks to reproduce the issue).