Lesson 5 git merge

I’m stuck on this one: ?I type git merge origin/master but it just says can’t merge for whatever reason.

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:

Updating a2ba090…bc87a1a
biology.txt | 2 ±
1 file changed, 1 insertion(+), 1 deletion(-)

You’ll need to be on the branch that you want to merge into.


$ git branch

To find out which branch you’re on, and

$ git checkout <branch>

To switch branch.

Does it only say “can’t merge” or does it say more? It may be telling you why.

Try to refresh the browser.
Now yo have to be in /my-quizzes
and type

git fetch origin

and then you can type

git merge origin/master

and you’ll notice the correct output so you can continue. good luck