diff --git a/Labs/Lab2/git-pr/1.png b/Labs/Lab2/git-pr/1.png index dfed87d7bcffde31d61f5c011fcb7cb65eee6e6e..f1c6c463d1cf9e24ce52ac5fedb67cf8bc6c6f0d 100644 Binary files a/Labs/Lab2/git-pr/1.png and b/Labs/Lab2/git-pr/1.png differ diff --git a/Labs/Lab2/git-pr/10.png b/Labs/Lab2/git-pr/10.png deleted file mode 100644 index a7ea7611989066e559acac405cc66156689d405c..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/10.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/11.png b/Labs/Lab2/git-pr/11.png deleted file mode 100644 index 94055d57419dba6fec622cf099312a5bf1103ec9..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/11.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/2.png b/Labs/Lab2/git-pr/2.png index 95a40c8e2e6dce9fc091b5b104c5433c11da10a0..30817b7e09f98844c6415e2b32845803f17b15bd 100644 Binary files a/Labs/Lab2/git-pr/2.png and b/Labs/Lab2/git-pr/2.png differ diff --git a/Labs/Lab2/git-pr/3.png b/Labs/Lab2/git-pr/3.png index f70ef27fe879387cc6fcbcafed9f317e6f6bd2e0..ae153488c719ce30f36e47fb24800f92fd1fdb8d 100644 Binary files a/Labs/Lab2/git-pr/3.png and b/Labs/Lab2/git-pr/3.png differ diff --git a/Labs/Lab2/git-pr/4.png b/Labs/Lab2/git-pr/4.png deleted file mode 100644 index 9b391f811ff95532814587cae8a0060cb2270b4f..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/4.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/5.png b/Labs/Lab2/git-pr/5.png deleted file mode 100644 index e5c6968d02ab7f91a776270c0cdaf7c5b9703e18..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/5.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/6.png b/Labs/Lab2/git-pr/6.png deleted file mode 100644 index 35cf8a0562957506a2d9394b33d3af8401743c8e..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/6.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/7.png b/Labs/Lab2/git-pr/7.png deleted file mode 100644 index cce1432c2324c2d9d349919a95717a0b4afd245b..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/7.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/8.png b/Labs/Lab2/git-pr/8.png deleted file mode 100644 index 5f5735176016b76c3ca8ab5b66d6e28e5c8dc695..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/8.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/9.png b/Labs/Lab2/git-pr/9.png deleted file mode 100644 index 0c92b651fd4e38271259c896597c2754ce0b6bcd..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/9.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/PR_list.png b/Labs/Lab2/git-pr/PR_list.png deleted file mode 100644 index 3734cc0c9db2521959a893e3cb693e8f717e91f0..0000000000000000000000000000000000000000 Binary files a/Labs/Lab2/git-pr/PR_list.png and /dev/null differ diff --git a/Labs/Lab2/git-pr/README.md b/Labs/Lab2/git-pr/README.md index a52246799cceb42ac1a2e0fe79b9c1ade9e4a7dd..3060c3d320281692ba89b8f41b6fb8c9c3c87d58 100644 --- a/Labs/Lab2/git-pr/README.md +++ b/Labs/Lab2/git-pr/README.md @@ -46,7 +46,7 @@ Consider a concrete example of how to use all these commands. Say you find a bu 7. Do a pull request from your fork to the main pandas repo 8. Somebody in charge of main repo will consider your changes, and probably (a) click a button on GitLab to incorporate your changes, or (b) give you feedback to make the code better first, in which case you go back to step 4 -## Step 2: SSH Keys +## Step 1: SSH Keys These steps are similar to the previous lab. There, we created SSH keys on your laptop, allowing you to connect laptop=>VM. Now, we're @@ -63,26 +63,34 @@ Run the following and **copy** the output: cat ~/.ssh/id_rsa.pub ``` -Go to "User settings", and Select "SSH keys". +Select "New SSH key". Name the key "cs320-vm" (or whatever you like, really) and paste the contents of `id_rsa.pub` to the "Key" box. +<img src="1.png" width=800> + Click "Add SSH Key" to finish adding it. -## Step 3: Create a Repo +## Step 2: Create a Repo + +Create a project repo called +"cs320-lab2". Pick the group as your netID. + +<img src="2.png" width=800> + +This should create a project. Go to that project. Click the **Clone** button, and then click **https**. Copy the commands in it. -Create a public repo called -"cs320-lab2". Do NOT initialize the repo by clicking on any checkbox at this step. Do NOT select "Add a README file". +<img src="3.png" width=800> -This should create a repo. Go to that repo. Click the **Clone** button, and then click **http**. Copy the commands in it. We want to run those in a new directory on your computer. So run this in the terminal: +We want to run those in a new directory on your computer. So run this in the terminal: ``` mkdir cs320-lab2 cd cs320-lab2 ``` -Then paste and run `git clone ` + what you copied from GitLab. You shouldn't be +Then paste and run `git clone [what you copied earlier]`. You shouldn't be asked for a password (if so, double check you did the parts of step 2+3 related to SSH correctly). If you see "Are you sure you want to continue connecting?", type "yes" and ENTER. @@ -94,7 +102,7 @@ git config --global user.name "your_gitLab_username" git config --global user.email "your_email" ``` -Refresh the GitLab page for your repo. You should now see the first commit. +Refresh the GitLab page for your repo at https://git.doit.wisc.edu/jwang2775/lab2 (with your username instead of "jwang2775"). You should now see the first commit. Make another change to README.md on your computer (for example, say "hello world"), push those changes to GitLab, then refresh the page.