[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).