[ticklemyelmo]

Why is there a "Jupyter+Git" problem specifically? Why aren't we worrying about the "C+Git" problem and the "XML+Git" problem and the "Python+Git" problem? Because merge markers break, well, every file format.

Is it because Jupyter users in particular don't typically understand that there is a formatted text file behind the notebook, or how merge conflicts work?

[Bjartr]

It's because the primary editor of the notebook files barfs when presented with the file if it includes merge markers since it's no longer valid json. Imagine if one of your normal code-friendly text editors, or your ide, refused to open a .c or .py file and you had to open it in notepad to fix it.

That's what it feels like to be forced to drop into a normal text editor rather than using the normal notebook ui to fix the conflicts.

[thefrozenone]

This is a good question and made me think. I have come up with: "Jupyter notebooks can be thought of as Code and an IDE layout"