nbstripout and git pull fails

[KrisThielemans]

See kynan/nbstripout#108

I vaguely remember a conversation with @casperdcl about this, but cannot find it back. I think I came to the conclusion that nbstripout doesn't use the correct filter settings, but I cannot remember, and definitely never tried anything.

It seems that the only fool-proof way is to do git reset --hard before the pull. Not ideal...

[casperdcl]

For very complicated cases I often tend to

nbstripout --uninstall
git stash
git pull
git stash pop
<fix conflicts>
nbstripout --install