Skip to content

Commit

Permalink
improvements to github repo creation episode
Browse files Browse the repository at this point in the history
  • Loading branch information
srerickson committed Jan 29, 2024
1 parent 9d34410 commit 0141bd3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions episodes/07-github.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ world. To this end we are going to create a *remote* repository that will be lin
## 1\. Create a remote repository

Log in to [GitHub](https://github.com), then click on the icon in the top right corner to
create a new repository called `planets`:
create a new repository called `simple-site`:

![](fig/github-create-repo-01.png){alt='Creating a Repository on GitHub (Step 1)'}

Name your repository "planets" and then click "Create Repository".
Name your repository "simple-site" and then click "Create Repository".

Note: Since this repository will be connected to a local repository, it needs to be empty. Leave
"Initialize this repository with a README" unchecked, and keep "None" as options for both "Add
Expand All @@ -55,8 +55,8 @@ information on how to configure your local repository:
This effectively does the following on GitHub's servers:

```bash
$ mkdir planets
$ cd planets
$ mkdir simple-site
$ cd simple-site
$ git init
```

Expand Down Expand Up @@ -97,11 +97,11 @@ minimum level for GitHub.

![](fig/github-change-repo-string.png){alt='Changing the Repository URL on GitHub'}

Copy that URL from the browser, go into the local `planets` repository, and run
Copy that URL from the browser, go into the local `simple-site` repository, and run
this command:

```bash
$ git remote add origin [email protected]:vlad/planets.git
$ git remote add origin [email protected]:vlad/simple-site.git
```

Make sure to use the URL for your repository rather than Vlad's: the only
Expand All @@ -118,8 +118,8 @@ $ git remote -v
```

```output
origin [email protected]:vlad/planets.git (fetch)
origin [email protected]:vlad/planets.git (push)
origin [email protected]:vlad/simple-site.git (fetch)
origin [email protected]:vlad/simple-site.git (push)
```

We'll discuss remotes in more detail in the next episode, while
Expand Down Expand Up @@ -309,7 +309,7 @@ Compressing objects: 100% (11/11), done.
Writing objects: 100% (16/16), 1.45 KiB | 372.00 KiB/s, done.
Total 16 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), done.
To https://github.com/vlad/planets.git
To https://github.com/vlad/simple-site.git
* [new branch] main -> main
```

Expand Down Expand Up @@ -386,7 +386,7 @@ $ git pull origin main
```

```output
From https://github.com/vlad/planets
From https://github.com/vlad/simple-site
* branch main -> FETCH_HEAD
Already up-to-date.
```
Expand All @@ -399,7 +399,7 @@ GitHub, though, this command would download them to our local repository.

## GitHub GUI

Browse to your `planets` repository on GitHub.
Browse to your `simple-site` repository on GitHub.
Underneath the Code button, find and click on the text that says "XX commits" (where "XX" is some number).
Hover over, and click on, the three buttons to the right of each commit.
What information can you gather/explore from these buttons?
Expand Down Expand Up @@ -516,7 +516,7 @@ remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/vlad/planets
From https://github.com/vlad/simple-site
* branch main -> FETCH_HEAD
* [new branch] main -> origin/main
fatal: refusing to merge unrelated histories
Expand All @@ -531,7 +531,7 @@ $ git pull --allow-unrelated-histories origin main
```

```output
From https://github.com/vlad/planets
From https://github.com/vlad/simple-site
* branch main -> FETCH_HEAD
Merge made by the 'recursive' strategy.
README.md | 1 +
Expand Down
Binary file modified episodes/fig/github-create-repo-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0141bd3

Please sign in to comment.