Document how to resolve conflicts on `.ipynb` files

When paired notebooks are committed we can still run into conflicts that are difficult to merge when the .ipynb files have inconsistent changes.

We should propose in the Jupytext documentation a simple way to e.g. ignore either the local or distant changes - anyway the .ipynb file will likely have to be re-generated from the text version once the conflicts on the text file have been solved.