Commit 003312b7 authored by Jonathan Leang's avatar Jonathan Leang
Browse files

minor edit

parent b6879808
......@@ -215,7 +215,7 @@ for any OS. For Eclipse, detailed instructions can be found at
We have created a git repository that you will use to commit and submit your the homework assignments.
This repository is hosted on the [CSE's GitLab](https://gitlab.cs.washington.edu) ,
and you can view it by visiting the GitLab website at
`https://gitlab.cs.washington.edu/cse414-18sp/cse414-[your CSE username]`.
`https://gitlab.cs.washington.edu/cse414-18sp/cse414-18sp--[your CSE username]`.
You'll be using this **same repository** for each of the homework assignments this quarter,
so if you don't see this repository or are unable to access it, let us know immediately!
......@@ -227,7 +227,7 @@ The first thing you'll need to do is set up a SSH key to allow communication wit
3. Click "Add SSH Key" and paste in your **public** key into the text area.
While you're logged into the GitLab website, browse around to see which projects you have access to.
You should have access to `cse414-[your username]`.
You should have access to `cse414-18sp--[your CSE username]`.
Spend a few minutes getting familiar with the directory layout and file structure. For now nothing will
be there except for the `hw1` directory with these instructions.
......@@ -236,14 +236,14 @@ To do this, you'll need to clone the 414 repository by issuing the following com
```sh
$ cd [directory that you want to put your 414 assignments]
$ git clone git@gitlab.cs.washington.edu:cse414-18sp/cse414-[your CSE username].git
$ cd cse414-[your CSE username]
$ git clone git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp--[your CSE username].git
$ cd cse414-18sp--[your CSE username]
```
This will make a complete replica of the repository locally. If you get an error that looks like:
```sh
Cloning into 'cse414-[your CSE username]'...
Cloning into 'cse414-18sp--[your CSE username]'...
Permission denied (publickey).
fatal: Could not read from remote repository.
```
......@@ -262,7 +262,7 @@ $ git remote -v
```
There is one more level of indirection to consider.
When we created your `cse414-[your CSE username]` repository, we forked a copy of it from another
When we created your `cse414-18sp--[your CSE username]` repository, we forked a copy of it from another
repository `cse414-18sp`. In `git` parlance, this "original repository" referred to as an `upstream` repository.
When we release bug fixes and subsequent labs, we will put our changes into the upstream repository, and you will need to be able to pull those changes into your own. See [the documentation](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) for more details on working with remotes -- they can be confusing!
......@@ -277,8 +277,8 @@ For reference, your final remote configuration should read like the following wh
```sh
$ git remote -v
origin git@gitlab.cs.washington.edu:cse414-18sp/cse414-[your CSE username].git (fetch)
origin git@gitlab.cs.washington.edu:cse414-18sp/cse414-[your CSE username].git (push)
origin git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp--[your CSE username].git (fetch)
origin git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp--[your CSE username].git (push)
upstream git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp.git (fetch)
upstream git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp.git (push)
```
......@@ -306,7 +306,7 @@ Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 286 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
To git@gitlab.cs.washington.edu:cse414-18sp/cse414-[your CSE username].git
To git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp--[your CSE username].git
cb5be61..9bbce8d master -> master
```
......@@ -365,7 +365,7 @@ Put your `.sql` files in `hw1/submission`. Your directory structure should
look like this after you have completed the assignment:
```sh
cse414-[your CSE username]
cse414-18sp--[your CSE username]
\-- README.md
\-- turnInHW.sh # script for turning in hw
\-- hw1
......@@ -409,19 +409,19 @@ $ ./turnInHw.sh hw11
[master b155ba0] Homework 1
1 file changed, 1 insertion(+)
Deleted tag 'hw1' (was b26abd0)
To git@gitlab.com:cse414-18sp/cse414-[your CSE username].git
To git@gitlab.com:cse414-18sp/cse414-18sp--[your CSE username].git
- [deleted] hw1
Counting objects: 11, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (6/6), 448 bytes | 0 bytes/s, done.
Total 6 (delta 3), reused 0 (delta 0)
To git@gitlab.com:cse414-18sp/cse414-[your CSE username].git
To git@gitlab.com:cse414-18sp/cse414-18sp--[your CSE username].git
ae31bce..b155ba0 master -> master
Counting objects: 1, done.
Writing objects: 100% (1/1), 152 bytes | 0 bytes/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To git@gitlab.com:cse414-18sp/cse414-[your CSE username].git
To git@gitlab.com:cse414-18sp/cse414-18sp--[your CSE username].git
* [new tag] hw1 -> hw1
```
......@@ -433,7 +433,7 @@ Git is a distributed version control system. This means everything operates offl
The bad thing is that you may **forget to `git push` your changes**. This is why we strongly, strongly suggest that you **check GitLab to be sure that what you want us to see matches up with what you expect**. As a second sanity check, you can re-clone your repository in a different directory to confirm the changes:
```sh
$ git clone git@gitlab.cs.washington.edu:cse414-18sp/cse414-[your CSE username].git confirmation_directory
$ git clone git@gitlab.cs.washington.edu:cse414-18sp/cse414-18sp--[your CSE username].git confirmation_directory
$ cd confirmation_directory
$ # ... make sure everything is as you expect ...
```
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment