Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a short paragraph explaining git pull and PRs are not the same #86

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion episodes/07-github.md
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ Our local and remote repositories are now in this state:
You may see a `-u` option used with `git push` in some documentation. This
option is synonymous with the `--set-upstream-to` option for the `git branch`
command, and is used to associate the current branch with a remote branch so
that the `git pull` command can be used without any arguments. To do this,
that the `git push` command can be used without any arguments. To do this,
simply use `git push -u origin main` once the remote has been set up.

Here, we are telling Git to push the branch
Expand Down
8 changes: 7 additions & 1 deletion episodes/10-pull-requests.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ The PR is now successfully merged into the `main` branch.
We can safely delete the `forecast` branch from the GitHub repo.
Click on the **Delete branch button**.

### Updating your Local Repo
## Updating your Local Repo

The new `forecast.md` file is currently only on the `main` branch in GitHub.
We should pull the changes down to our local copy.
Expand Down Expand Up @@ -199,6 +199,12 @@ Fast-forward
create mode 100644 forecast.md
```

`git pull` and GitHub's Pull Requests are not the same.
GitHub Pull Requests are where we performed code and science review,
then merged our feature branch changes into the `main` branch.
`git pull` is fetching changes to the remote branch on GitHub
and merging them into your local copy.

::::::::::::::::::::::::::::::::::::::::: callout

## You may need to tell Git what to do
Expand Down
2 changes: 1 addition & 1 deletion episodes/fig/github-repo-after-first-push.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.