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?
Did you try:
git fetch
before you tried to merge?
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
Check this post
Basically I got it to work by closing the terminal session at each new exercise section.
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…
yes, I did. Still doesn’t work…
but thanks for the suggestion!
Yes I tried it. I restarted the window, the terminal, the section, etc. … still doesn’t work.
thanks, though
yuta0827:
orgin
I don’t know if you did this every time, but you have a typing mistake there.
1 Like
AHHHHH!! Dang! Thanks albionsrefuge! that solved the problem!!
1 Like
This was the step that I was missing. Do you always have to ‘git fetch’ before you can ‘get merge origin/master’?
yj1500
July 8, 2016, 1:34am
#10
I was also stuck on that exercise. Typing “git fetch” before merging seems to work for me.
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.
system
closed
July 15, 2016, 5:12pm
#12
This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.