From d853569b01878bfed64034095bd54f992cbc5899 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:00:58 -0600 Subject: [PATCH 01/18] edit Exercise-3.md: tht -> that --- Exercise-3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-3.md b/Exercise-3.md index ce1ef4b..bf63d35 100644 --- a/Exercise-3.md +++ b/Exercise-3.md @@ -6,7 +6,7 @@ You can do this manually by running `git pull --rebase` instead of a regular `gi You will however probably soon forget to add the `--rebase` switch, so instead we want to configure Git to do this automatically. -Run: `git config pull.rebase true` in your repository to configure *rebase* as the default strategy for this repo, or `git config --global pull.rebase true` if you want to adopt this behaviour for all repositories tht you work with. +Run: `git config pull.rebase true` in your repository to configure *rebase* as the default strategy for this repo, or `git config --global pull.rebase true` if you want to adopt this behaviour for all repositories that you work with. ## Development From c8eaa551549d6b4125a2e239c782c1f762bf5fa0 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:02:38 -0600 Subject: [PATCH 02/18] edit Howto_SSH_Auth.md: reformat term id_ed25519 Replace (a) `` id_ed25519` with (b) `id_ed25519` --- Howto_SSH_Auth.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Howto_SSH_Auth.md b/Howto_SSH_Auth.md index 663bde6..da8c835 100644 --- a/Howto_SSH_Auth.md +++ b/Howto_SSH_Auth.md @@ -8,8 +8,7 @@ The following should cover the basics. If you need further help, se link at the `ls -al ~/.ssh` -Look for files named `id_rsa` (private key) and `id_rsa.pub` (public key). You might also have a keys named `id_ecdsa` or `` -id_ed25519` with their corresponding public keys. +Look for files named `id_rsa` (private key) and `id_rsa.pub` (public key). You might also have a keys named `id_ecdsa` or `id_ed25519` with their corresponding public keys. ## Generate a New Key Pair From 6035d2cf9f8b7a25b66de883b848146fc622793b Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:04:30 -0600 Subject: [PATCH 03/18] edit Howto_SSH_Auth.md: 'a keys' -> 'keys' --- Howto_SSH_Auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Howto_SSH_Auth.md b/Howto_SSH_Auth.md index da8c835..b9b4cd4 100644 --- a/Howto_SSH_Auth.md +++ b/Howto_SSH_Auth.md @@ -8,7 +8,7 @@ The following should cover the basics. If you need further help, se link at the `ls -al ~/.ssh` -Look for files named `id_rsa` (private key) and `id_rsa.pub` (public key). You might also have a keys named `id_ecdsa` or `id_ed25519` with their corresponding public keys. +Look for files named `id_rsa` (private key) and `id_rsa.pub` (public key). You might also have keys named `id_ecdsa` or `id_ed25519` with their corresponding public keys. ## Generate a New Key Pair From e8d99f1b76a2f139b4828301aaafb33d84afbdd0 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:12:41 -0600 Subject: [PATCH 04/18] edit Exercise-0.md: 'One' -> 'Once' --- Exercise-0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-0.md b/Exercise-0.md index 740014f..7cd17d0 100644 --- a/Exercise-0.md +++ b/Exercise-0.md @@ -34,7 +34,7 @@ The leader has the following responsibilities to get everyone started: Clone your team repository: -One you have accepted the invite, you will land on the GitHub page for your teams copy of the multiplayer project, with full read/write permissions. Clone the repository. +Once you have accepted the invite, you will land on the GitHub page for your teams copy of the multiplayer project, with full read/write permissions. Clone the repository. Note: It is possible to clone via either `https` or `ssh`, and each requires a different way of authenticating. From 27846913c5bab3f6f68c564690d3dbbcc523a39b Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:14:04 -0600 Subject: [PATCH 05/18] edit Exercise-0.md: "teams" -> "team's" --- Exercise-0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-0.md b/Exercise-0.md index 7cd17d0..e80587a 100644 --- a/Exercise-0.md +++ b/Exercise-0.md @@ -34,7 +34,7 @@ The leader has the following responsibilities to get everyone started: Clone your team repository: -Once you have accepted the invite, you will land on the GitHub page for your teams copy of the multiplayer project, with full read/write permissions. Clone the repository. +Once you have accepted the invite, you will land on the GitHub page for your team's copy of the multiplayer project, with full read/write permissions. Clone the repository. Note: It is possible to clone via either `https` or `ssh`, and each requires a different way of authenticating. From 52264d76569fe689a930fc7feb7bd2c46b71ab5e Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:19:26 -0600 Subject: [PATCH 06/18] edit Exercise-1.md: teams -> team's --- Exercise-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-1.md b/Exercise-1.md index adfa20e..0f312ff 100644 --- a/Exercise-1.md +++ b/Exercise-1.md @@ -13,7 +13,7 @@ But we still want to work on the same "code base" to experience how git behaves, * Your favourite colour * Your favourite food but do this in smaller individual changes. -1. For each change, make a Commit with a good commit message and push your changes to the teams remote repository. +1. For each change, make a Commit with a good commit message and push your changes to the team's remote repository. 1. Keep your local master up-to-date once your team is finished by using `git pull` (or `git fetch` followed my `git merge`) Repeat step 2-4 adding even more info to you file, like maybe your favorite dad-jokes. From c48e76749f02d64803d90367719b42cc73585006 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:20:13 -0600 Subject: [PATCH 07/18] edit Exercise-1.md: step -> steps --- Exercise-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-1.md b/Exercise-1.md index 0f312ff..92fb643 100644 --- a/Exercise-1.md +++ b/Exercise-1.md @@ -16,7 +16,7 @@ But we still want to work on the same "code base" to experience how git behaves, 1. For each change, make a Commit with a good commit message and push your changes to the team's remote repository. 1. Keep your local master up-to-date once your team is finished by using `git pull` (or `git fetch` followed my `git merge`) -Repeat step 2-4 adding even more info to you file, like maybe your favorite dad-jokes. +Repeat steps 2-4 adding even more info to you file, like maybe your favorite dad-jokes. > Note: Remember that Git will only let you push changes if your local branch is up to date with what is on the remote. If others on your team have pushed changes in the mean time, your `git push` will get "rejected". Then you will have to update your local repository (as in step 4 above) and try to push again. From 608eb1bbda5e6732dd423e04b38ee88948db0526 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:21:00 -0600 Subject: [PATCH 08/18] edit Exercise-1.md: 'you file' -> 'your file' --- Exercise-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-1.md b/Exercise-1.md index 92fb643..dfcbcc8 100644 --- a/Exercise-1.md +++ b/Exercise-1.md @@ -16,7 +16,7 @@ But we still want to work on the same "code base" to experience how git behaves, 1. For each change, make a Commit with a good commit message and push your changes to the team's remote repository. 1. Keep your local master up-to-date once your team is finished by using `git pull` (or `git fetch` followed my `git merge`) -Repeat steps 2-4 adding even more info to you file, like maybe your favorite dad-jokes. +Repeat steps 2-4 adding even more info to your file, like maybe your favorite dad-jokes. > Note: Remember that Git will only let you push changes if your local branch is up to date with what is on the remote. If others on your team have pushed changes in the mean time, your `git push` will get "rejected". Then you will have to update your local repository (as in step 4 above) and try to push again. From 0e39ac417b22692aca61dc6176b2ccc4a0a0313a Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:22:43 -0600 Subject: [PATCH 09/18] edit Exercise-1.md and Howto_SSH_Auth.md: align spelling Replace uses of (a) favorite with (b) favourite in order to use 'favourite' throughout pages. --- Exercise-1.md | 2 +- Howto_SSH_Auth.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Exercise-1.md b/Exercise-1.md index dfcbcc8..6f5fa5c 100644 --- a/Exercise-1.md +++ b/Exercise-1.md @@ -16,7 +16,7 @@ But we still want to work on the same "code base" to experience how git behaves, 1. For each change, make a Commit with a good commit message and push your changes to the team's remote repository. 1. Keep your local master up-to-date once your team is finished by using `git pull` (or `git fetch` followed my `git merge`) -Repeat steps 2-4 adding even more info to your file, like maybe your favorite dad-jokes. +Repeat steps 2-4 adding even more info to your file, like maybe your favourite dad-jokes. > Note: Remember that Git will only let you push changes if your local branch is up to date with what is on the remote. If others on your team have pushed changes in the mean time, your `git push` will get "rejected". Then you will have to update your local repository (as in step 4 above) and try to push again. diff --git a/Howto_SSH_Auth.md b/Howto_SSH_Auth.md index b9b4cd4..5a11712 100644 --- a/Howto_SSH_Auth.md +++ b/Howto_SSH_Auth.md @@ -25,7 +25,7 @@ Now you need to copy the public key to your clipboard: (replace the file path, i On Mac, you can run `pbcopy < ~/.ssh/id_rsa.pub`. On Windows, you can run `clip < ~/.ssh/id_rsa.pub`. -Alternatively, you can open the file in your favorite text editor or run `cat ~/.ssh/id_rsa.pub` to print it out to the terminal and copy it from there. +Alternatively, you can open the file in your favourite text editor or run `cat ~/.ssh/id_rsa.pub` to print it out to the terminal and copy it from there. Now go to your GitHub account settings, navigate to "SSH and GPG keys," and click "New SSH key." Paste the copied key into the provided field and add a descriptive title. From 9ba4ae76741e3f93ff676efa91ae6855ccdb7b40 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:30:21 -0600 Subject: [PATCH 10/18] edit Exercise-1.md: 'Commit' -> 'commit' --- Exercise-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-1.md b/Exercise-1.md index 6f5fa5c..1ab9d3b 100644 --- a/Exercise-1.md +++ b/Exercise-1.md @@ -13,7 +13,7 @@ But we still want to work on the same "code base" to experience how git behaves, * Your favourite colour * Your favourite food but do this in smaller individual changes. -1. For each change, make a Commit with a good commit message and push your changes to the team's remote repository. +1. For each change, make a commit with a good commit message and push your changes to the team's remote repository. 1. Keep your local master up-to-date once your team is finished by using `git pull` (or `git fetch` followed my `git merge`) Repeat steps 2-4 adding even more info to your file, like maybe your favourite dad-jokes. From 86dc31a32551051d507aead941da8be889415266 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:35:34 -0600 Subject: [PATCH 11/18] edit Exercise-2.md: 'team mates' -> 'teammates' --- Exercise-2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-2.md b/Exercise-2.md index a1c7bc3..d6b24f8 100644 --- a/Exercise-2.md +++ b/Exercise-2.md @@ -14,7 +14,7 @@ In this part of the "project" we actively want to enjoy the fun and pain of gett * A garden or yard? * Any extras you want -* As in any good software project, limit yourself to one feature per commit. Remember good commit messages so your team mates know which features you added. Remember to share your changes every time. +* As in any good software project, limit yourself to one feature per commit. Remember good commit messages so your teammates know which features you added. Remember to share your changes every time. * If you get a merge conflict, you will have to resolve this. Remember to enjoy this process :smile: and the added bonus that conflict markers look a bit like ascii-art. From 07b7d9cbd1a7e33f7099a20cd3cde29bcc132594 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:36:14 -0600 Subject: [PATCH 12/18] edit Exercise-2.md Replace (a) "Remember good commit messages" with (b) "Remember to write good commit messages" for clarity and to match next sentence: "Remember to share" --- Exercise-2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-2.md b/Exercise-2.md index d6b24f8..01250e1 100644 --- a/Exercise-2.md +++ b/Exercise-2.md @@ -14,7 +14,7 @@ In this part of the "project" we actively want to enjoy the fun and pain of gett * A garden or yard? * Any extras you want -* As in any good software project, limit yourself to one feature per commit. Remember good commit messages so your teammates know which features you added. Remember to share your changes every time. +* As in any good software project, limit yourself to one feature per commit. Remember to write good commit messages so your teammates know which features you added. Remember to share your changes every time. * If you get a merge conflict, you will have to resolve this. Remember to enjoy this process :smile: and the added bonus that conflict markers look a bit like ascii-art. From e0734bdc73172ad95ff999258a723435d9446c35 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:38:57 -0600 Subject: [PATCH 13/18] edit Exercise-3.md: 'team mates' -> 'teammates' --- Exercise-3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercise-3.md b/Exercise-3.md index bf63d35..0148f2a 100644 --- a/Exercise-3.md +++ b/Exercise-3.md @@ -1,6 +1,6 @@ # Exercise 3 -In this phase of the project, we want to switch from `merge` to `rebase` when integrating our own changes with those of our team mates. +In this phase of the project, we want to switch from `merge` to `rebase` when integrating our own changes with those of our teammates. You can do this manually by running `git pull --rebase` instead of a regular `git pull`. This will invoke the usual *fetch*, and then rebase your local changes on top of the fetched changes instead of doing the normal *merge*. From 89678a5f43023d910c2ecc95c7d67e1f2b148be5 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:42:02 -0600 Subject: [PATCH 14/18] edit Howto_PAT_Auth.md: 'IN' -> 'In' --- Howto_PAT_Auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Howto_PAT_Auth.md b/Howto_PAT_Auth.md index 8ac312c..d1bb2a6 100644 --- a/Howto_PAT_Auth.md +++ b/Howto_PAT_Auth.md @@ -6,7 +6,7 @@ Use Personal Access Tokens for secure authentication when accessing GitHub repos - Go to your GitHub account settings, then navigate to "Developer settings" > "Personal access tokens." (or just go to directly) - Click "Generate new token" and provide a meaningful note. -- Select the scopes (permissions) you need. IN this case, the topmost `repo` does the job. +- Select the scopes (permissions) you need. In this case, the topmost `repo` does the job. - Select an *Expiration* time. For security, it's best to keep the token valid for as short a time as possible, and for this workshop, you can set it to expire in 1 day. You can always generate a new token later. - Click "Generate token" and copy the generated token to a safe place. From ef2df9ebc5205ef7b79e8d50dcb3835e64dbb90c Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:44:26 -0600 Subject: [PATCH 15/18] edit Howto_PAT_Auth.md: 'for the 2 hours' -> 'for 2 hours' --- Howto_PAT_Auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Howto_PAT_Auth.md b/Howto_PAT_Auth.md index d1bb2a6..8d8ec4e 100644 --- a/Howto_PAT_Auth.md +++ b/Howto_PAT_Auth.md @@ -26,7 +26,7 @@ git config --global credential.helper cache git config --global credential.helper 'cache --timeout=7200' ``` -This just tells Git to remember your password for the 2 hours which is probably enough for this exercise. +This just tells Git to remember your password for 2 hours which is probably enough for this exercise. ## Clone Repositories From 52bb44a123cbac0d2cfabc370d4ee7727dcf18a9 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:46:54 -0600 Subject: [PATCH 16/18] edit Howto_SSH_Auth.md: 'se link' -> 'see link' --- Howto_SSH_Auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Howto_SSH_Auth.md b/Howto_SSH_Auth.md index 5a11712..907a5b3 100644 --- a/Howto_SSH_Auth.md +++ b/Howto_SSH_Auth.md @@ -1,6 +1,6 @@ # Set up SSH authentication for GitHub -The following should cover the basics. If you need further help, se link at the bottom of the page. +The following should cover the basics. If you need further help, see link at the bottom of the page. ## Check for Existing Keys From 9a2cd8d57debce073ea2daabed9ed84ebbc25476 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:51:10 -0600 Subject: [PATCH 17/18] edit Howto_SSH_Auth.md: 'keypair' -> 'key pair' Replace 'keypair' with 'key pair' to align with other uses of 'key pair' on page. --- Howto_SSH_Auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Howto_SSH_Auth.md b/Howto_SSH_Auth.md index 907a5b3..64d6909 100644 --- a/Howto_SSH_Auth.md +++ b/Howto_SSH_Auth.md @@ -20,7 +20,7 @@ Replace `"your_email@example.com"` with your GitHub-associated email. When promp ## Upload Public Key to GitHub -Now you need to copy the public key to your clipboard: (replace the file path, if you have a keypair with different names) +Now you need to copy the public key to your clipboard: (replace the file path, if you have a key pair with different names) On Mac, you can run `pbcopy < ~/.ssh/id_rsa.pub`. On Windows, you can run `clip < ~/.ssh/id_rsa.pub`. From e12d45a06274ea50bdfa5072517faa43f809b738 Mon Sep 17 00:00:00 2001 From: Andrew Zipperer Date: Wed, 25 Dec 2024 12:53:05 -0600 Subject: [PATCH 18/18] edit Howto_SSH_Auth.md Replace (a) a key pair with different names with (b) a key pair with a different name There are two names: - filename - filename.pub so, "with different names" makes sense. But, because "a key pair" is singular, a single name also makes sense. --- Howto_SSH_Auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Howto_SSH_Auth.md b/Howto_SSH_Auth.md index 64d6909..1f23fd8 100644 --- a/Howto_SSH_Auth.md +++ b/Howto_SSH_Auth.md @@ -20,7 +20,7 @@ Replace `"your_email@example.com"` with your GitHub-associated email. When promp ## Upload Public Key to GitHub -Now you need to copy the public key to your clipboard: (replace the file path, if you have a key pair with different names) +Now you need to copy the public key to your clipboard: (replace the file path, if you have a key pair with a different name) On Mac, you can run `pbcopy < ~/.ssh/id_rsa.pub`. On Windows, you can run `clip < ~/.ssh/id_rsa.pub`.