What do I type for step 2? - GIT Merge II

Get Help Git
,
#1

GIT Merge II

What do I type for step 2?

You are on your local master branch. In your commit history, the commit message of the HEAD commit is:

Add first question to Physics     quiz

From the terminal, merge with origin/master , where Sally’s most recent commits are.

Notice the output:

Updating a2ba090..bc87a1aFast-forward biology.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
  • Git has performed a “fast-forward” merge, bringing your local master branch up to speed with Sally’s most recent commit on the remote.
#2

I’d hazard a guess you’d be looking to merge with the commit mentioned. Try checking the docs for the correct syntax- https://git-scm.com/docs

1 Like
#3

The Syntax you’re looking for on step 2 is:

git merge origin/master

I hope this Helps!