Git merge Part 5 Step 2

gertjandw · June 5, 2016, 2:14pm

Im stuck at the exact same part.

Typing: ‘git merge origin/master’ or ‘git merge origin’ or ‘git merge master’ does not do anything and gives the same error as in the printscreen submitted by sandsbe20.

gertjandw · June 5, 2016, 2:22pm

Alright, after some more trial and error… here is how I got past it in the end:

Pressed Get Help in bottom right and clicked restart.
Got to step #2 again and same problem as described in this thread.
Closed the bash terminal by clicking the X
New session
cd my-quizzes
git fetch (yes, again!)
git merge origin/master
(At step #3 type): git log

Hope this helps anyone with some error.

napoleaofw · June 6, 2016, 12:41am

great! this solution works fine. but… why we have to do a fetch again!? it’s a bug of codecademy exercises? anyone reported that? and sorry for my english… i’m from Brazil. =D

akaaki157 · June 7, 2016, 3:19am

Thanks - I followed your steps to bypass this error as well.

deesa · June 8, 2016, 7:14am

Thanks for solution!
I did only steps 3-8 from your solution and it works fine!

barbodgif · June 8, 2016, 8:28am

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:

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 session at the beginning of every exercise.

netsurfer68240 · June 8, 2016, 7:32pm

This solved my problem

hkrioca · June 9, 2016, 4:40pm

Nice job gertjandw. Thank you!

ndisera · June 15, 2016, 4:44am

Thanks a lot gertjandw!

jorge.alvarez · June 15, 2016, 2:54pm

Thank you! This was the solution to the problem. Basically I had done “git fetch” in a wrong way on the previous step.

egore_burial · June 15, 2016, 4:17pm

Yep, same problem and I have found out why.

I went to science-quizzes directory and see that there is still only two files and biology.txt does not exists!

ssssoooo, i created it by myself, added, commited and BAM! Commands in instruction worked well in my bash, but exercise still not passed =( maybe cuz lines in bash are not the same as in example in instruction.

so i think it is some bug in excercise.

upd: passed by closing bash and starting new session in each excersice.

smccre00 · June 17, 2016, 1:21am

Oh my gosh I was stuck here forever… thank you so much!!!

shegohackit · June 17, 2016, 7:43pm

you are a genius man !!!

arrayjumper97672 · June 17, 2016, 9:40pm

Genius!!!
This approach works very well.

digitaljumper12156 · June 18, 2016, 12:52am

Thank you barbodgif! I tried various other proposed solutions in this forum to no avail . It was only after I read your post, suggesting that the user close and open a new bash session at the beginning of every exercise, that I was able to continue. So once again, thank you !

If anyone is having this issue, i suggest reading the post made by barbodgif !

jazzaero · June 19, 2016, 6:16pm

Thanks for the answer. I was getting frustrated with this step.

mzkitty1920 · June 21, 2016, 4:43am

THANK YOU SOO MUCH!!

tantiss · June 21, 2016, 6:34am

Still helping 16d after posting
Thank you

leonneon · June 22, 2016, 6:29pm

Thank You for help dude.

vlp_vt · June 25, 2016, 3:13am

Thenks!
That was a great job!