|
| 1 | +--- |
| 2 | +title: Confirming Spring Upstream |
| 3 | +toc: true |
| 4 | +--- |
| 5 | + |
| 6 | +# Confirming Spring Upstream |
| 7 | + |
| 8 | +--- |
| 9 | + |
| 10 | +You may have some references to the Fall 2025 repository -- and my apologies for not replacing the link when including the git instructions. The instructions are updated, but the following includes specific instructions for each circumstance. |
| 11 | + |
| 12 | +There are two scenarios you could fall into: |
| 13 | +1. **You forked the Fall repo**, or |
| 14 | +2. **Your upstream is the Fall repo**. |
| 15 | + |
| 16 | +You can determine if you fall into either of these scenarios from the following steps. |
| 17 | + |
| 18 | +**Check your repo name.** It should be `Interactive-Data-Vis-Spring2026`. If the reference is `-Fall2025`, follow instructions for [forking the correct repo](#if-you-forked-the-fall-repo). |
| 19 | + |
| 20 | +**Check your remote repository links.** You can do so by navigating to the project folder in your terminal and running: |
| 21 | + |
| 22 | +```sh |
| 23 | +git remote -v |
| 24 | +``` |
| 25 | + |
| 26 | +You should see both your origin and upstream remotes. Example: |
| 27 | + |
| 28 | +```text |
| 29 | +origin https://github.com/[YOUR_USERNAME]/Interactive-Data-Vis-Spring2026.git (fetch) |
| 30 | +origin https://github.com/[YOUR_USERNAME]/Interactive-Data-Vis-Spring2026.git (push) |
| 31 | +upstream https://github.com/InteractiveDataVis/Interactive-Data-Vis-Spring2026.git (fetch) |
| 32 | +upstream https://github.com/InteractiveDataVis/Interactive-Data-Vis-Spring2026.git (push) |
| 33 | +``` |
| 34 | + |
| 35 | +If your upstream is not there, **or it references the old repo** at `https://github.com/InteractiveDataVis/Interactive-Data-Vis-Fall2025.git`, you'll need to re-do the upstream via [the instructions below](#if-your-upstream-is-the-fall-repo). |
| 36 | + |
| 37 | +Once you're done, you can pull Lab 1 into your fork. And I promise, no fall references this time... |
| 38 | + |
| 39 | +--- |
| 40 | + |
| 41 | +## If you forked the Fall repo |
| 42 | + |
| 43 | +This does require a complete re-forking of the appropriate repo to include all the details you will need for this semester. |
| 44 | + |
| 45 | +You should first fork the appropriate repo before archiving the incorrect fork. That way, you can copy the work you've already done for Lab 0. |
| 46 | + |
| 47 | +1. Follow the instructions in the [Lab 0 readme](https://github.com/InteractiveDataVis/Interactive-Data-Vis-Spring2026/tree/main/src/lab_0) to fork the correct repo. You probably already have all the installations if you completed them before. |
| 48 | +2. Confirm your upstream is correct by continuing to the following steps: |
| 49 | + |
| 50 | +--- |
| 51 | + |
| 52 | +## If your `upstream` is the Fall repo |
| 53 | + |
| 54 | +Your fork of the class repo should stay connected to the correct Spring 2026 class repository. That way you can pull new labs, fixes, and content when I update the repo. |
| 55 | + |
| 56 | +You should be able to push and pull from your origin, as well as pull new content from the class repo. |
| 57 | + |
| 58 | +- **`origin`** → your fork (e.g. `https://github.com/[YOUR_USERNAME]/Interactive-Data-Vis-Spring2026.git`) |
| 59 | +- **`upstream`** → the class repo: `https://github.com/InteractiveDataVis/Interactive-Data-Vis-Spring2026.git` |
| 60 | + |
| 61 | +If **`upstream`** is missing, add it: |
| 62 | + |
| 63 | +```sh |
| 64 | +git remote add upstream https://github.com/InteractiveDataVis/Interactive-Data-Vis-Spring2026.git |
| 65 | +``` |
| 66 | + |
| 67 | +If **`upstream`** already exists but points to the wrong URL, update it instead: |
| 68 | + |
| 69 | +```sh |
| 70 | +git remote set-url upstream https://github.com/InteractiveDataVis/Interactive-Data-Vis-Spring2026.git |
| 71 | +``` |
| 72 | + |
| 73 | +Then run `git remote -v` again to confirm. |
| 74 | + |
| 75 | +For the full GitHub setup (fork, clone, upstream, Pages, and syncing), see [Lab 0: Getting Started](/lab_0/readme). |
| 76 | + |
| 77 | +--- |
| 78 | + |
| 79 | +## Pulling Released Labs |
| 80 | + |
| 81 | +After your upstream points to the Spring 2026 repo, pull the latest content (including Lab 1) into your local copy: |
| 82 | + |
| 83 | +```sh |
| 84 | +git fetch upstream |
| 85 | +git merge upstream/main |
| 86 | +``` |
| 87 | + |
| 88 | +Do this from your project folder, ideally before you start new work. If you have uncommitted changes, commit or stash them first (commit = [save changes to the repo](https://docs.github.com/en/pull-requests/committing-changes-to-your-project); stash = [temporarily set them aside](https://docs.github.com/en/desktop/making-changes-in-a-branch/stashing-changes-in-github-desktop)). After merging, you should see the `lab_1` folder and any other updates from the class repo. |
| 89 | + |
| 90 | +You can repeat these two steps every time a new lab is released. |
0 commit comments