Skip to content
Merged
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
30 changes: 14 additions & 16 deletions courses/foundation/git/week1/assignment.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,26 @@ Finish all exercises from the session, then do the following:

## Exercise 1

In this exercise you will get some practice submitting your assignment by pushing it to GitHub and then creating a pull request.
In this exercise you will get some practice submitting your assignment by pushing it to GitHub and then creating a pull request (PR).
You will be using this workflow every week to submit your assignment, so it's important that you get comfortable with it.
You will also practice adding/committing files one by one.

You will use the Assignment repository created on the last session. Here are the instructions:

1. In your terminal, navigate to your assignment repository on your computer
2. Go to branch `main`
3. Pull the latest changes to make sure your local `main` is up to date
4. Create a branch for your assignment, named `git-week1/your-name`, and move to that branch
5. Inside the folder `git/week1` create 3 new files:
1. Create a new repository in your GitHub called `hyf-foundation` (this will be your Assignments Repository). Clone it locally.
2. In your terminal, navigate to the freshly cloned repository on your computer
3. Go to branch `main`
4. Pull the latest changes to make sure your local `main` is up to date
5. Create a branch for your assignment, named `git-week1`, and move to that branch
6. Create a folder called `git` and inside of it another folder called `week1`.
7. Inside the `week1` folder create 3 new files:
- a file named `my-favourite-food.txt`, inside the file write your favourite dish recipe (you can just find a random recipe on Google and paste it in the file ;)
- a file named `my-second-favourite-food.txt`, inside the file write the recipe for your second favourite dish
- a file named `countries.txt`, where you list three countries that you have visited (this doesn't need to be true, you can just write the names of three random countries)
6. Add and commit the file `my-favourite-food.txt`
7. Add and commit the file `my-second-favourite-food.txt`
8. Add and commit the file `countries.txt`
9. Push your changes into your assignment repository on GitHub
10. Go to GitHub and create a pull request (PR) from the branch `git-week1/your-name` to `main`

> [!TIP]
> In the future, you can find a reminder of how to submit your assignments in the "Readme.md" file in your assignments repo, under the heading "Completing the assignments".
8. Add and commit the file `my-favourite-food.txt`
9. Add and commit the file `my-second-favourite-food.txt`
10. Add and commit the file `countries.txt`
11. Push your changes into your assignment repository on GitHub
12. Go to GitHub and create a pull request (PR) from the branch `git-week1` to `main`
13. Add a link to your PR on the Assignment Sheet under the `GIT 1` column

## Cheat sheet / tips

Expand Down
19 changes: 10 additions & 9 deletions courses/foundation/git/week1/session-plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,17 @@ These are some examples of previously created materials by mentors that you can

### Exercise 1

**Objective:** The goal is to set up your assignment repository fork and create your first PR (Pull Request).
**Objective:** The goal is to set up your assignment repository and create your first Pull Request (PR).

> [!NOTE]
> You will use this repository to hand in your assignments during the entire HackYourFuture program.

1. Create a repository fork on your GitHub and clone it locally, following the instructions from [HackYourFuture-CPH/hyf-assignment-template](https://github.com/HackYourFuture-CPH/hyf-assignment-template)
1. Create a repository on your GitHub called `hyf-foundation` (this will be your Assignments Repository) and clone it locally
2. Check out to a new branch called `html-and-css`
3. Add the session exercises from the previous week to the `html-css/week1` folder
4. Create a PR (Pull Request) [to your own repository](https://github.com/HackYourFuture-CPH/hyf-assignment-template?tab=readme-ov-file#2-submission-process), from your `html-and-css` branch to merge changes into the `main` branch
5. Finally, have the person on your right review this PR before you agree to merge it to `main`.
3. Create a folder called `html-css`. Inside it create another folder called `week1` (the path inside becomes `html-css/week1`.
4. Add the session exercises from the previous week to `html-css/week1`.
5. Create a PR (Pull Request) [to your own repository](https://github.com/HackYourFuture-CPH/hyf-assignment-template?tab=readme-ov-file#2-submission-process), from your `html-and-css` branch to merge changes into the `main` branch
6. Finally, have the person on your right review this PR before you agree to merge it to `main`.

**Tips for this exercise:**

Expand All @@ -113,7 +114,7 @@ These are some examples of previously created materials by mentors that you can

### Exercise 2

1. When you are on `main` branch, of the assignment repository create a branch named `git-week1/exercise-1/<your-name>` and move to it

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove it from this part, but then I need to remove this from all the exercises explanation, since it's been mention everywhere.

1. When you are on `main` branch, of the assignment repository create a branch named `git-week1/exercise-1` and move to it
2. Create a folder named `session-playground` in the `git` folder, under `/week1`
3. Create the following files inside the `session-playground` folder: `apples-file.txt`, `bananas-file.txt`, `oranges-file.txt`
4. Add some text to each of the files
Expand All @@ -128,7 +129,7 @@ These are some examples of previously created materials by mentors that you can

**Objective:** The goal of this exercise is to practice the assignment workflow.

1. When you are on `main` branch, create a branch named `git-week1/exercise-3/<your-name>` and move to it
1. When you are on `main` branch, create a branch named `git-week1/exercise-3` and move to it
2. Create a file named `my-assignment.txt` in the `git` folder, under `/week1/session-playground`
3. Add some text to the `my-assignment.txt` file
4. Add and commit the changes in the `my-assignment.txt` file
Expand All @@ -147,7 +148,7 @@ These are some examples of previously created materials by mentors that you can

**Objective:** Face your first Git error and try to find a solution online on your own.

1. On your assignment repository go to the branch `main`, create a branch `git-week1/exercise-4/<your-name>` and move to it
1. On your assignment repository go to the branch `main`, create a branch `git-week1/exercise-4` and move to it
2. In the `git` folder, under `/week1/session-playground`, create a file named `colors.txt`
3. Add two colors to the file `colors.txt`, one per line
4. Add and commit the changes in the `colors.txt` file
Expand All @@ -161,7 +162,7 @@ These are some examples of previously created materials by mentors that you can
**Objective:** Learn to handle a common mistake of forgetting to checkout to the right branch, when already having a few commits pushed.

1. On your assignment repository **DON'T** go to the main branch, make sure to stay on the branch from the previous exercise.
2. Create a branch `git/week1/exercise-5/<your-name>` and move to it
2. Create a branch `git/week1/exercise-5` and move to it
3. In the `git` folder, under `/week1/session-playground`, create a file named `movies.txt`
4. Add two movie names to the file `movies.txt`, one per line
5. Add and commit the changes in the `movies.txt` file
Expand Down
Loading