Hey Landen. It sounds like you may have corrupted the directories/branches while you were trying to figure it out. I was struggling with this one too, but I solved it. Here are my steps:
Reset the console & directories:
1. Click on the "Get Help" button in the bottom right hand corner.
2. Click on the "I want to restart this exercise" in the drop-up menu.
Enter the following commands to the terminal:
- $ cd my-quizzes
- $ git fetch origin
- $ git merge origin/master
- $ git log
Why this works:
"$ git fetch" - Downloads object(s) and ref(s) from another repository. Apparently the origin/master is not part of your local copy, so you have to download it with "$ git fetch" before you can merge.