I need help with this one guys, really badly its not letting me merge the origin and master branches and its driving me crazy!!!!!!
Are you still stuck on this one?
yes I am still stuck on this one
Could you post a screenshot of your whole web browser so that I can see what you see?
I think you're talking about this exercise
step 1 Enter this command: cd my-quizzes
step 2 From the terminal, merge with origin/master, where Sally's most recent commits are. : git merge origin/master
step 1 Print the commit history: git log
So after getting that error, I ran
git merge origin/master
That really help.Thank you.
Thanks.. It helped me too..
should have done git fetch before checking this answer..!