I’ve been following along with the instructions in the “More involved but proper way” video for adding my google-homepage to the curriculum. Everything worked fine until I entered ‘git pull upstream master’ and got the following message:
Marks-MacBook:curriculum mnh$ git pull upstream master remote: Enumerating objects: 13, done. remote: Counting objects: 100% (13/13), done. remote: Compressing objects: 100% (9/9), done. remote: Total 13 (delta 5), reused 5 (delta 4), pack-reused 0 Unpacking objects: 100% (13/13), done. From https://github.com/TheOdinProject/curriculum * branch master -> FETCH_HEAD * [new branch] master -> upstream/master hint: Waiting for your editor to close the file... Merge branch 'master' of https://github.com/TheOdinProject/curriculum # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. ~ ~ ~
The ~ continue to the bottom of the screen and are followed by this message:
“~/TOP/curriculum/.git/MERGE MSG” 7L, 297C
What should I do?