From 44982f121423a1443a95be771396834d25f5506f Mon Sep 17 00:00:00 2001 From: Ester Date: Fri, 22 Feb 2019 23:11:08 +0000 Subject: [PATCH 1/2] Add links to task folders in main README --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7151354..0b02457 100644 --- a/README.md +++ b/README.md @@ -29,39 +29,39 @@ Made by @alesssia, @estramcar & @feiphoon. ### Exercises -#### Creating a repository (one person) +#### [Creating a repository (one person)](/workshop/01-creating-a-repository) 3. Each group should pick one teammate to create a repository in Github. It should have a README, LICENSE, description and `.gitignore`. 4. The repository owner should add their teammates as collaborators on the repository. -#### Making commits (everyone) +#### [Making commits (everyone)](/workshop/02-making-commits) 5. Write your name in your group's repository README and commit it directly to `master`. -#### Creating issues (everyone) +#### [Creating issues (everyone)](/workshop/03-creating-issues) 6. Create an issue based on a question (from a provided list). -#### Responding to issues (everyone) +#### [Responding to issues (everyone)](/workshop/04-making-commits) 7. Pick an issue to resolve, by assigning it to yourself and leaving a nice comment telling others you'll own it. 8. Create a branch to address your assigned issue. 9. Create a folder and file (with path instructions) 10. Commit your new file to your branch. -#### Asking for a review (everyone) +#### [Asking for a review (everyone)](/workshop/05-making-commits) 11. Use compare on your own branch to look at your own changes, and open a pull request. Link to the issue in the pull request description. 12. Catch-up point/timecheck (how many groups have at least one pull request open, 5min). -#### Reviewing changes (everyone) +#### [Reviewing changes (everyone)](/workshop/06-making-commits) 13. Look at the pull request you were assigned to review. View the file diff in the pull request to see what was changed. 14. Make a comment on any line in the file in the pull request (submit it with "Add a single comment"). 15. Change to the pull request's branch and learn to find/navigate files. 16. Make a general comment on the pull request you are reviewing. -#### Approving changes (everyone) +#### [Approving changes (everyone)](/workshop/07-approving-changes) 17. Return to your pull request and read any comments left by others on yours. Click "Resolve conversation" on the comments (if everything is alright!) -#### Merging changes (everyone) +#### [Merging changes (everyone)](/workshop/08-merging-changes) 18. Merge your own branch into `master`. -#### Clean up (everyone) +#### [Clean up (everyone)](/workshop/09-clean-up) 19. Delete your merged branch. :tada::tada::tada::tada::tada: From e23ad96e6272329232504c2624fd4b0693a805e6 Mon Sep 17 00:00:00 2001 From: Ester Date: Fri, 22 Feb 2019 23:18:00 +0000 Subject: [PATCH 2/2] Update task 07 name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b02457..f5202fa 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Made by @alesssia, @estramcar & @feiphoon. 15. Change to the pull request's branch and learn to find/navigate files. 16. Make a general comment on the pull request you are reviewing. -#### [Approving changes (everyone)](/workshop/07-approving-changes) +#### [Accepting a review (everyone)](/workshop/07-accepting-review) 17. Return to your pull request and read any comments left by others on yours. Click "Resolve conversation" on the comments (if everything is alright!) #### [Merging changes (everyone)](/workshop/08-merging-changes)