Having trouble getting past part 1. I get part 1 correct but can't get part 2 to work..... Please HELP !
Copy of code and error message below:
You are on your local master branch. In your commit history, the commit message of the HEAD commit is:
Add first question to Physics quiz
From the terminal, merge with origin/master, where Sally's most recent commits are.
Notice the output:
biology.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Git has performed a "fast-forward" merge, bringing your local master branch up to speed with Sally's most recent commit on the remote.
Print the commit history.
Error Message : Did you merge origin/master into your local master branch?