search

SyneRBI / SyneRBI_VM

Virtual Machine with pre-installed SyneRBI software
http://www.ccpsynerbi.ac.uk
Apache License 2.0
3 stars 7 forks source link

nbstripout and git pull fails #147

Open KrisThielemans opened 4 years ago

KrisThielemans commented 4 years ago

See https://github.com/kynan/nbstripout/issues/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 commented 4 years ago

For very complicated cases I often tend to

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