Skip to content

Commit cfd2806

Browse files
committed
adds note about the interstitial merge that will happen during pull
1 parent 090565b commit cfd2806

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ _Notice we are following the directions git provided above._
156156
$ git pull
157157
```
158158

159+
The git command should open an editor with a default merge message. Close the editor window that it opened, and the command will complete.
160+
161+
>`git pull` is doing two things. First it retrieves information about what commits are in the remote repository. Then it tries to merge those changes into the local repository. If we had pulled before committing, git would have been able to bring down the changes directly without additional intervention on our part. However, since we all committed before trying to pull, git needs to do some bookkeeping. It records a local merge commit message, but allows us to edit the message ourselves if we would like!
162+
159163
After pulling changes from GitHub verify that the local repository matches GitHub. Then each remaining teammate should push their changes to GitHub.
160164

161165
```

0 commit comments

Comments
 (0)