jmbejara
commented
6 years ago I believe that this error occurred because Git was trying to merge the new changes with changes that you made when you ran the original version of the notebook. The Jupyter notebook format and Git don't always work very well together.
Here are a couple of solutions:
- The easiest is to delete your copy of the notebook and download the new version. You will lose any of your own changes you made to the lecture notebook with this method.
- A better way is to do something like. Depending on the state of you Git repo, you could "discard changes" in the MLE notebook and reset it to the current version of
master. Note that you will still lose any of your own changes you made to the lecture notebook with this method. The following screenshot shows how to do this in GitKraken:
- An overkill solution would be something like this. With this solution, you will discard all changes that have been made in the repo directory and reset everything to match the current version that I have on GitHub. You can accomplish this in GitKraken by making sure that you are on the master branch and then right-clicking the most recent commit of the master branch. There is an option that says "reset master to this commit" and you can choose a "hard reset." I've included a screenshot:
Let me know if you would like additional clarification. Git can be tricky!!
ethanmetzger
I am having a problem opening the updated MLE Lecture. Any idea how to fix the error?