Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Exercise-0.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.

Expand Down
4 changes: 2 additions & 2 deletions Exercise-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ 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.
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.

Expand Down
2 changes: 1 addition & 1 deletion Exercise-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.

Expand Down
4 changes: 2 additions & 2 deletions Exercise-3.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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*.

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

Expand Down
4 changes: 2 additions & 2 deletions Howto_PAT_Auth.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/settings/tokens> 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.

Expand All @@ -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

Expand Down
9 changes: 4 additions & 5 deletions Howto_SSH_Auth.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# 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

Before generating a new key pair, check if you already have an existing SSH key. Run the following command in your terminal:

`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

Expand All @@ -21,12 +20,12 @@ 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 a different name)

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.

Expand Down