From 80db5501da2b24dcc8bbbb6d8276690db367087f Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Thu, 5 Dec 2024 15:02:22 +0000 Subject: [PATCH 1/4] Update homework.md --- homework.md | 102 ++++------------------------------------------------ 1 file changed, 7 insertions(+), 95 deletions(-) diff --git a/homework.md b/homework.md index 35d995b6..10339fa2 100644 --- a/homework.md +++ b/homework.md @@ -1,113 +1,25 @@ # Linus's Homework -## Question 1 - -What is 2 + 2? +## 1. What is 2 + 2? 5 -## Question 2 - -What is the opposite of Black? - -Purple - -## Question 3 - -What is the 2 * 3 * 6 * 1 * 10 * 34? - -1322 - -## Question 4 - -What does HTML stand for? - -Hyper Tall Massive Language - -## Question 5 - -What is CSS useful for? +## 2. What is JavaScript? -Making a website go faster +An exciting new play about coffee. -## Question 6 - -Using CSS, how would I select every `

` tag on the page? - -```css -#h1 { - -} -``` - -## Question 7 - -What is JavaScript? - -A programming language used on the internet - -## Question 8 - -What three problem does Git & Github solve? +## 3. What three problems does Git & Github solve? When people want to show off code to each other they can put it on Github -## Question 9 - -What happens when you `fork` a repository? +## 4. What happens when you `fork` a repository? You delete it -## Question 10 - -What happens when you clone a repostory? +## 5. What happens when you clone a repository? It send it to a friend -## Question 11 - -What is a Pull Request? +## 6. What is a Pull Request? When you send a file over the internet - -## Question 12 - -What is the Git History log? - -It lets you see into the future - -## Question 13 - -What does it meant to "push" changes to Github? - -You send the changes of your local repository to Github - -## Question 14 - -What is Github? - -A place for us to store and share our code. - -## Question 15 - -What does it mean to "Commit your changes"? - -Send you code to Github - -## Question 16 - -What program do we use to write code at CodeYourFuture? - -Microsoft Word - -## Question 17 - -What do you use "Commit Messages" for? - -To record what changes you made to the code - -## Question 18 - -Where can I look to find help with Git? - -The Git Cheatsheet! From 2e2d3e1cf2a251a938671e100147ad3228296a2c Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Wed, 11 Dec 2024 10:24:02 +0000 Subject: [PATCH 2/4] Clarification and typos --- README.md | 3 +-- homework.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 22a26be5..acb927df 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,4 @@ Can you help him to fix or improve the answers to his homework? 2. Clone the repository to your computer 3. Create a branch with an appropriate name for the task you're on 3. Fix the errors in Linus's homework in `homework.md` -4. Create a Pull Request back to this repository with the correct answers - +4. Create a Pull Request back to this repository with the correct answers. Make sure your Pull Request is created in CodeYourFuture's fork, not your personal fork. diff --git a/homework.md b/homework.md index 10339fa2..f7a8449a 100644 --- a/homework.md +++ b/homework.md @@ -8,9 +8,9 @@ An exciting new play about coffee. -## 3. What three problems does Git & Github solve? +## 3. What three problems does Git & GitHub solve? -When people want to show off code to each other they can put it on Github +When people want to show off code to each other they can put it on GitHub ## 4. What happens when you `fork` a repository? From 3cd5c630d70c982d972866f87eea9d344ce44e4b Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Tue, 7 Jan 2025 09:43:48 +0000 Subject: [PATCH 3/4] Update city/class to cohort in PR template --- .github/pull_request_template.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ef29eeab..032b8606 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,12 +1,15 @@ From bc07ccb589e93af58e0b393fa4521a7a7fe7999c Mon Sep 17 00:00:00 2001 From: CJ Yuan Date: Tue, 20 May 2025 10:09:40 +0100 Subject: [PATCH 4/4] Added "No review required" note and changed PR template (#745) --- .github/pull_request_template.md | 32 +++++++++++++++++++++----------- README.md | 6 ++++++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 032b8606..c3e0510b 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,24 +2,34 @@ You must title your PR like this: -COHORT_NAME | FIRST_NAME LAST_NAME | REPO_NAME | WEEK +REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME For example, -ITP-OCT-24 | Carol Owen | GitHomeworkFixErrors | Week1 + London | May-2025 | Carol Owen | Sprint-1 -Complete the task list below this message. -If your PR is rejected, check the task list. +--> + +## Learners, PR Template + -# Your Details +Self checklist -- Your Name: -- Your City: -- Your Slack Name: +- [ ] I have titled my PR with REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME +- [ ] My changes meet the requirements outlined in the `README.md` of this task -# Homework Details +## Changelist -- Module: -- Week: + +Briefly explain your PR. diff --git a/README.md b/README.md index acb927df..f158d4a8 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,9 @@ Can you help him to fix or improve the answers to his homework? 3. Create a branch with an appropriate name for the task you're on 3. Fix the errors in Linus's homework in `homework.md` 4. Create a Pull Request back to this repository with the correct answers. Make sure your Pull Request is created in CodeYourFuture's fork, not your personal fork. + + +## How to check your work? +If you have correctly submitted your PR, you can find it in https://github.com/CodeYourFuture/GitHomeworkFixErrors/pulls. + +Please note that your PR will not undergo an official review, as none is required. Most PRs at CodeYourFuture get reviewed, but this one is just for you to practice creating them.