Git 5 step 2 "not something we can merge"

[yuta0827]

Someone! Help!

https://www.codecademy.com/en/courses/learn-git/lessons/git-teamwork/exercises/git-merge-ii?action=lesson_resume&link_content_target=interstitial_lesson

When I say,

git merge orgin/master

it says,

merge: orgin/master - not something we can merge

I tried it many times, read other posts, restarted the section, etc., and it did not help.

Here, copy and pasted it. I don’t know how to do a screen shot, sorry.

cd my-quizzes git merge orgin/master
merge: orgin/master - not something we can merge

I tried all the things on other posts. No luck. Does someone know how to get past it?

[albionsrefuge]

I tried all the things on other posts.

Did you try:

git fetch

before you tried to merge?

[designslayer83829]

I am having the same issue. Im really frustrated. Seems like my codecademy connection keeps getting lost also though my internet connection has been stable

[designslayer83829]

Check this post
Basically I got it to work by closing the terminal session at each new exercise section.

Git merge Part 5 Step 2

If anybody likes to know, the origin() of the problem resides in the last exercise ( 4.git fetch ). Here is the screenshot for more information: [image] And the bug is that the science-quizzes won’t be updated unless we close the bash session and open a new one. (Maybe has do with the inner workings of ccterminal.) Actually a new directory will be created , changing it from ~/workspace/curriculum/ to ~/workspace/curriculum-a/ So ultimate solution is to close and open the bash ses…

[yuta0827]

yes, I did. Still doesn’t work…
but thanks for the suggestion!

[yuta0827]

Yes I tried it. I restarted the window, the terminal, the section, etc. … still doesn’t work.
thanks, though

[albionsrefuge]

orgin

I don’t know if you did this every time, but you have a typing mistake there.

[yuta0827]

AHHHHH!! Dang! Thanks albionsrefuge! that solved the problem!!

[devmaster41692]

This was the step that I was missing. Do you always have to ‘git fetch’ before you can ‘get merge origin/master’?

[yj1500]

I was also stuck on that exercise. Typing “git fetch” before merging seems to work for me.

[albionsrefuge]

Do you always have to ‘git fetch’ before you can ‘get merge origin/master’?

In real life, you would do that to make sure you had the most up-to-date data. git pull does a git fetch followed by a git merge.

In this exercise, I think that it just forgets that you’ve fetched in the previous exercise.