Skip to content

Commit ad22eb2

Browse files
committed
The content in "How can I get changes that other people make into my clone?" section is no longer relevant because students don't make a fork of the GettingStarted repository anymore. There is not a common commit history.
1 parent d326003 commit ad22eb2

1 file changed

Lines changed: 0 additions & 30 deletions

File tree

README.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -291,36 +291,6 @@ make a clone of your GitHub repository using with:
291291
$ git clone https://github.com/YourGitHubId/JoyOfCodingWinter2026.git
292292
```
293293

294-
### How can I get changes that other people make into my clone?
295-
296-
You can expect that the scripts and information in this repository
297-
will change and evolve over time. You may want these changes in your
298-
repository. Here's what you need to do to incorporate changes made in
299-
this "upstream" repository into your own repository.
300-
301-
First, configure your repository to have this repository to be a
302-
"remote" named "upstream".
303-
304-
```sh
305-
$ cd JoyOfCodingWinter2026
306-
$ git remote add upstream https://github.com/JoyOfCodingPDX/GettingStarted.git
307-
```
308-
309-
Then, you can "pull" and "merge" changes from the upstream repository
310-
in to your own local clone.
311-
312-
```sh
313-
$ git pull upstream main
314-
```
315-
316-
After you've resolved any conflicts caused by changes to your
317-
repository and changes to the upstream repository. You can push those
318-
changes back to GitHub ("origin") with:
319-
320-
```sh
321-
$ git push
322-
```
323-
324294
## How do I submit my projects?
325295

326296
The reason that this course can scale to support so many students is that many of the time-consuming "overhead"

0 commit comments

Comments
 (0)