Skip to content

Commit 38beed4

Browse files
committed
mv "Contributing non-trivial changes" step to "group work" episode
1 parent 583312f commit 38beed4

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

contributing.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -169,40 +169,6 @@ We can practice how a conflict looks and how to resolve it:
169169

170170
---
171171

172-
## Step 5: Contributing non-trivial changes
173-
174-
Submit a larger change using GitHub Desktop. As an example our task will be to
175-
add a new file (in our case a taco recipe) to the exercise repository.
176-
177-
178-
### Note to instructors
179-
180-
- A participant shares screen and creates a repository, then instructor takes screen share and
181-
we go through steps to contribute to that repository (without write permissions), then
182-
screen share goes back to participant and we together review this change
183-
184-
185-
### Exercise
186-
187-
- We first open an issue via the web interface
188-
and describe our idea. In the issue we can collect feedback
189-
- We clone the exercise repository using GitHub Desktop
190-
- Create a new branch
191-
- Add the new file to the local repository
192-
- Commit and refer to the issue (e.g. here closing issue number 12: "this is the commit message, closes #12")
193-
- Try to publish that branch (you may not have write permissions to the repository on GitHub)
194-
- If you don't have write permissions: "Fork this repository", then try to publish the branch to the fork
195-
- "Create Pull Request"
196-
- If you forgot to refer to the issue in the commit, you can [refer to the issue](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) in the pull request
197-
198-
199-
### Bonus exercise
200-
201-
- Send a pull request with a typo/mistake in it and adjust the pull request with a subsequent commit. Discuss
202-
how adjusting pull requests can be a useful mechanism.
203-
204-
---
205-
206172
> ## Summary
207173
>
208174
> - In this episode we learned how to propose changes and submit changes via "pull requests".

group-work.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,37 @@ questions:
1313
---
1414

1515
# How to organize a group's work
16+
17+
---
18+
19+
## Step X: Contributing non-trivial changes
20+
21+
Submit a larger change using GitHub Desktop. As an example our task will be to
22+
add a new file (in our case a taco recipe) to the exercise repository.
23+
24+
25+
### Note to instructors
26+
27+
- A participant shares screen and creates a repository, then instructor takes screen share and
28+
we go through steps to contribute to that repository (without write permissions), then
29+
screen share goes back to participant and we together review this change
30+
31+
32+
### Exercise
33+
34+
- We first open an issue via the web interface
35+
and describe our idea. In the issue we can collect feedback
36+
- We clone the exercise repository using GitHub Desktop
37+
- Create a new branch
38+
- Add the new file to the local repository
39+
- Commit and refer to the issue (e.g. here closing issue number 12: "this is the commit message, closes #12")
40+
- Try to publish that branch (you may not have write permissions to the repository on GitHub)
41+
- If you don't have write permissions: "Fork this repository", then try to publish the branch to the fork
42+
- "Create Pull Request"
43+
- If you forgot to refer to the issue in the commit, you can [refer to the issue](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) in the pull request
44+
45+
46+
### Bonus exercise
47+
48+
- Send a pull request with a typo/mistake in it and adjust the pull request with a subsequent commit. Discuss
49+
how adjusting pull requests can be a useful mechanism.

0 commit comments

Comments
 (0)