[kingds]

seems very odd. the issue was that when Git marked lines in a file as being in conflict then the file was no longer a valid Jupyter file. and their solution was... to change the language so that Git's conflict syntax is valid?

[jph00]

No the answer was simply that git doesn’t come with a merge driver for json, only one for line oriented text. So nbdev provides one for ipynb json documents.

[CJefferson]

Yes, I think you are right. Seems like quite a good plan to me. Nothing else obvious jumps to mind, as anyone using git is going to end up with git conflict markers in their files at some point.

[skadamat]

yeah it's definitely some classic engineering around the problem, but hard to fix Github I guess. At a previous company, we switched to Gitlab for the specific reason that they handled notebook diffs slightly better. It's a struggle out here

[Animux]

Note that the git conflict markers have nothing to do with Github but are generated by git itself (the commmand line client running locally on your machine).