|
|
|
|
|
|
by Bjartr
1390 days ago
|
|
|
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. |
|
|