Skip to content

Commit f6532f2

Browse files
authored
Merge pull request #59 from coderefinery/rkdarst/instructor-note
Use instructor-note directive where appropriate
2 parents ef21435 + 8cabead commit f6532f2

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

contributing.md

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ belong to others.
1818
We will do this in a progression from a small trivial fix to a change proposal
1919
and discuss the pros and cons.
2020

21-
22-
## Note to instructors
23-
24-
- The instructor will prepare an example repository and share the link with the
25-
participants (see instructor guide for more details).
26-
- This is a good example text: <https://www.gutenberg.org/ebooks/24542>
27-
- When showing how to add a collaborator, also show how to unwatch a repo.
28-
29-
3021
> ## Recap: different methods to "download" a repository
3122
>
3223
> - There is no need to download each file one by one.
@@ -37,6 +28,14 @@ and discuss the pros and cons.
3728
> - Cloning copies not only the latest version but all snapshots and all branches and tags: entire history.
3829
{: .discussion}
3930

31+
```{instructor-note}
32+
- The instructor will prepare an example repository and share the link with the
33+
participants (see instructor guide for more details).
34+
- This is a good example text: <https://www.gutenberg.org/ebooks/24542>
35+
- When showing how to add a collaborator, also show how to unwatch a repo.
36+
```
37+
38+
4039
---
4140

4241
## Step 1: Learn how to add collaborators to your repository
@@ -135,12 +134,11 @@ sharing screen:
135134

136135
## Step 4: Resolving a conflict
137136

138-
### Note to instructors
139-
137+
```{instructor-note}
140138
- "Non-talking instructor" prepares a conflicting commit during session (check
141139
what the first PR does).
142140
- Conflict can be shown as demo.
143-
141+
```
144142

145143
### Exercise/demo: let us experience a conflict
146144

creating-using-web.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ suggestions. In a larger group the instructor can demonstrate these and then
2424
participants can try on their own and then ask questions.
2525

2626

27-
## Note to instructors
2827

28+
```{instructor-note}
2929
In this episode we are all in the main room and do these steps together as
3030
follow-along with pauses with time for questions and answers, no breakout rooms
3131
yet.
32+
```
3233

3334
---
3435

group-work.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,11 @@ Should I add everybody as collaborator?
7676

7777
## Optional exercise contributing larger changes
7878

79-
### Note to instructors
80-
79+
```{instructor-note}
8180
- A participant shares screen and creates a repository, then instructor takes screen share and
8281
we go through steps to contribute to that repository (without write permissions), then
8382
screen share goes back to participant and we together review this change
84-
83+
```
8584

8685
### Exercise
8786

0 commit comments

Comments
 (0)