Probably due to my sporadic use of git; but, when I issue the git pull command from ~fastai$, I get the following error message:
error: Your local changes to the following files would be overwritten by merge:
courses/dl1/lesson1.ipynb
Please, commit your changes or stash them before you can merge.
Aborting
I tried git commit but that leads me down an even deeper path into git syntax which doesn’t seem to converge very easily. Any help appreciated. I was saved by a git pull when I began the course and the first model wasn’t running correctly. I don’t want to miss any important updates.
It’s best to work on a copy of the notebooks, in order to avoid this problem.
2 Likes
Thanks for this advice. I will do that from now on. Is there a way for me to resolve the issue now that I have created it? Or is that not important?
If you don’t mind loosing the work you’ve done on Jeremy’s notebooks just do a git reset --hard if you want to keep the work, make a copy now before executing that command.
5 Likes
Thanks.
Did the hard reset. Learned the lesson. All’s well.
1 Like