Stuck at 88% on git


#1

I don't know what I am supposed to do


#2

If I could tell which exercise was "88%" then I would help you!


#3

I am on the git exercise


#4

You are either being funny or you are pulling my leg. :smile:


#5

here is the link https://www.codecademy.com/en/courses/learn-git/lessons/git-teamwork/exercises/git-merge-II?action=resume I cant remember what I did with the second one to because I had a break from school


#6

Step 1 : change to the my-quizzes directory: cd my-quizzes
- now you are in the my-quizzes directory

Step 2: merge with origin/master: git merge origin/master
- now your local master has merged with the origin/master

Step 3: print the commit history: git log
- now you can see all the commits that have been made


#7

the second one didn't work
here is a screenshot of what I am doing


#8

Can you do:

  • a pwd to confirm your working directory
  • an ls to show all the files in your working directory

Post a screenshot of all that.


#9


#10

Okay, so your are definitely in the my-quizzes directory.

Now, to do step 2. To merge with origin/master you do this:

git merge origin/master

#11

the git merge origin/master didn't work


#12

Could you post a screenshot of the whole browser please?


#13


#14

It sounds like it has lost your previous work.

You might have to reset this exercise and try again. Under the Get Help button there is an option called "I want to restart this exercise". Do that and then repeat the steps for this exercise.

If it still doesn't work, go back one more exercise and reset and redo that exercise.


#15

if git merge origin/master doesn't work do git fetch first then git merge origin/master


#16

The answer from @albionsrefuge is what fixed it for me. git fetch then git merge origin/master.


#17

i was stuck in this one for 2 days!
my problem was solved exactly the way that @albionsrefuge said.
one step back to the git fetch and restart it.


#18

Use git fetch before you git merge.
This exercise seems to be connected to the previous step. if you reset the exercise chances are that the git fetch from previous step is ignored hence you git fetch first then git merge. then continue to git log


#19

Something came in the mail today.... deez replys, ha Got em.