What do I type for step 2?
You are on your local
masterbranch. In your commit history, the commit message of the
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
masterbranch up to speed with Sally’s most recent commit on the remote.