Origin/master not something we can merge


#1



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


it says
$ git merge origin/master
merge: origin/master - not something we can merge

Does anyone know how to solve this probelm?


#2

Hello @nthu_104062225,

Sorry you're having issues on this. Please see my post on:

Git merge origin/master

Hope this helps! :slight_smile:


#3

hi @bayoishola20

Thank you for your reply!

I think you did help but I have another issue.

after I typed in what you wrote, it responded " refname 'origin/master' is ambiguous

What does that mean and how can I solve it?


Get stuck see the screenshot
There's a problem with Lesson 5 in Learn Git - Teamwork
#4

Okay. Please, restart console/exercise and do the below:

ls
cd my-quizzes/
Git fetch origin
Git merge origin/master

#5

Dear @bayoishola20

Although I'm not really sure what happened but it worked!!!!

Huge thanks


#6

Okay,

ls - shows all files in current working directory. It is short for list
cd my-quizzes/ - to change directory. The backward slash is important :slight_smile:
Git fetch - this updates remote-tracking branches but it never changes any of your own local branches, and is safe to do without changing your working copy. This can fetch from either a single named repository or URL, or from several repositories at once (a condition follows for the latter part).

Git merge - This will merge choice sources/repos.

:slight_smile:


#7

Thank you so much for your explicit explanation!


#8

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.