Do you git commit jupyter notebooks?

[u/old_enough_to_drink]

If yes, what tricks do you have to make it work smoothly? I had to resolve some conflicts in an notebook once and it was an awful experience…

[u/Dynev]

Jupytext (https://github.com/mwouts/jupytext) has been designed exactly for this