Repository navigation
simple merge conflicts in notebooks require manually editing the ipynb json #160941
Description
Locally I have an empty cell at the bottom of my notebook because I executed the last cell
When I try to merge in a change that has new cells, I get a merge conflict that requires I open the ipynb in a text editor to resolve.
Reacted by Julius Marozas, hopdebee, LucaMarconato, Martin Citoler, Stephen Kraemer, Arthur Delannoy, Guy Rosin, Known Rabbit and T-256
Activity
rebornix commentedon Oct 21, 2022
We can explore how to handle this gracefully in the serializer.
DonJayamanne commentedon May 9, 2023
Peng Lyu (@rebornix) not sure what needs to be done in the serializer here. can you provide more information, i would have thought this was purely an issue with merge conflicts.
yohfdo commentedon Nov 16, 2023
Can this please be solved? It's hard to work collaboratively within a team using Jupyter notebooks and VS Code if we can't sort out merge conflicts.
ttimasdf commentedon Feb 22, 2024
I suggest there be an option to disable the notebook renderer temporarily in all editors. git operates at the text level and when merge conflict happens, it will likely produce a malformed JSON file.
We now have an error message to notify users to fallback to text editor, but "resolve in merge editor" button still don't work.
DonJayamanne commentedon May 28, 2024
Note:
Steps to test
Resolve in Merge Editorbutton and verify you get the merge editor (again plain text), see here simple merge conflicts in notebooks require manually editing the ipynb json #160941 (comment)