5. Git Merge


#1

Whenever I write;
$ git merge origin/master
for the second instruction, it always tells me;
merge: origin/master - not something we can merge
what does this mean and how do I fix it?


#2

Your repo needs to be have knowledge of the other repo and to merge it also needs to posses the commits of the branch you're merging into yours.

You probably just need to fetch:

git fetch origin

If origin is missing, then this should add it back:
git remote add origin ../science-quizzes
and then fetch again.