Skip to content
Merged
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
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,40 +29,40 @@ 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.
17. Approve the pull request.

#### Accepting a review (everyone)
#### [Accepting a review (everyone)](/workshop/07-accepting-review)
18. 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)
19. Merge your own branch into `master`.

#### Clean up (everyone)
#### [Clean up (everyone)](/workshop/09-clean-up)
20. Delete your merged branch.
21. Close the issue that your pull request resolved.

Expand Down