Git Teamwork


#1

On the Git Teamwork I am stuck.
The system asks me to do two simple things:
1- Enter in the directory my-quizzes
2- use git merge

I am doing it, but receiving error:

$ cd my-quizzes/
$ git merge origin/master
merge: origin/master - not something we can merge

I am already in my master branch:
$ git branch
* master

And this way, it doesn't allow me to proceed, because the "Next" buttom is disabled until this step is correct.

Any tip?


#2

How did you get to master? I suppose you should have been on a branch.

Then you need checkout to master before merge-ing (the fencing).

A screenshot could help though! :slight_smile:


#3

I am already in master.

Here is the code:

$ cd my-quizzes/
$ git checkout master
Already on 'master'
$ git merge origin/master
merge: origin/master - not something we can merge
$


#4

You will need to do this in step: See Ho to solve this commit history
git fetch origin
git merge origin/master


#5

Yes, it solved. Thanks. I wonder why this wasn't mentioned in the tutorial.. but anyway.

Thank you. ;]


#6

You're welcome.

Have fun coding! :slight_smile:


#7

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