Skip to content

Commit 3af51f1

Browse files
authored
Update hand-in-homework-guide.md
1 parent 316147f commit 3af51f1

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

hand-in-homework-guide.md

+12-15
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,29 @@ Watch the video (by clicking the image) or go through the following walk-through
1212

1313
ONE TIME ONLY (START OF EVERY MODULE)
1414

15-
1. Create a [fork](https://help.github.com/en/articles/fork-a-repo) of the HackYourHomework forked repository (https://www.github.com/HackYourHomework/React). You do this by using the `fork` option on the top right
15+
1. Create a [fork](https://help.github.com/en/articles/fork-a-repo) of the homework module repository. For JavaScript (as well as the next 2 modules), the homework module repository is `https://www.github.com/HackYourHomework/React-classXX` where XX is your class number. You do this by using the `fork` option on the top right
1616
2. Navigate to the URL of the cloned repository (it should be in your personal GitHub account, under "repositories")
1717
3. Clone the repository, using SSH, to your local machine. You can do this by typing in `git clone <git url>` in the command line
1818
4. On your local machine, navigate to the folder using the command line
1919
5. Make sure you've cloned it correctly by running `git status` from the command line.
2020

2121
EVERY WEEK
2222

23-
1. Create a new branch for each week you have homework. For example, for the week 1 homework for React create a branch called `week-1-homework-YOUR_NAME`
24-
2. Inside the correct week folder, create another folder called `homework`. Make your homework files in there, while on the correct branch
25-
3. Once you're finished, add and commit everything. Make the commit message meaningful, for example `finished project for homework week1`
26-
4. deploy the homework on netlify/now and copy the the deplyed link.
27-
5. Push the branch to your forked repository
28-
6. On the GitHub page of your forked repository, click on the `create pull request` button. Make sure the `base repository` is your teacher's repository, on branch master
29-
7. Give the pull request a title in the following format:
23+
1. Do a `git pull` on your main branch to get the latest version.
24+
2. Create a new branch for each week you have homework. For example, for the week 1 homework for JavaScript create a branch called `YOUR_NAME-w1-JavaScript`. Don't forget to checkout this branch after creating it.
25+
3. Make your homework!
26+
4. Once you're finished, add your homework to a commit. Make sure you *only* commit your homework files and nothing else. You can use `git add -p` if you only want to add a couple files. You can always check what is happening with the `git status` command (as one of our mentors always says, it is the console.log of git!).
27+
5. Create the commit (`git commit`). Make the commit message meaningful, for example `finished project for homework week1`.
28+
6. Deploy the homework on netlify/now and copy the the deployed link.
29+
7. Push the branch to your forked repository
30+
8. On the GitHub page of your forked repository, click on the `create pull request` button. Make sure the `base repository` is your teacher's repository, on branch master
31+
9. Give the pull request a title in the following format:
3032

3133
```markdown
3234
Homework week 1 <Your name>
3335
```
3436

35-
8. add the deployed url of the homework to the pull request description.
36-
9. Submit the pull request from your forked repository branch into the `master` branch
37-
10. Do a little victory dance because you did it! Good job!
38-
39-
For a visual walkthrough the steps please watch the following video one of our teachers, Unmesh Joshi, has made:
40-
41-
- [GitHub Homework flow](https://www.youtube.com/watch?v=2qJPAVTiKPE)
37+
10. Add the deployed url of the homework to the pull request description.
38+
11. Submit the pull request from your forked repository branch into the `master` branch
4239

4340
If you have any questions or if something is not entirely clear ¯\\\_(ツ)\_/¯, please ask/comment on Slack!

0 commit comments

Comments
 (0)