@@ -18,15 +18,6 @@ belong to others.
18
18
We will do this in a progression from a small trivial fix to a change proposal
19
19
and discuss the pros and cons.
20
20
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
-
30
21
> ## Recap: different methods to "download" a repository
31
22
>
32
23
> - There is no need to download each file one by one.
@@ -37,6 +28,14 @@ and discuss the pros and cons.
37
28
> - Cloning copies not only the latest version but all snapshots and all branches and tags: entire history.
38
29
{: .discussion}
39
30
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
+
40
39
---
41
40
42
41
## Step 1: Learn how to add collaborators to your repository
@@ -135,12 +134,11 @@ sharing screen:
135
134
136
135
## Step 4: Resolving a conflict
137
136
138
- ### Note to instructors
139
-
137
+ ``` {instructor-note}
140
138
- "Non-talking instructor" prepares a conflicting commit during session (check
141
139
what the first PR does).
142
140
- Conflict can be shown as demo.
143
-
141
+ ```
144
142
145
143
### Exercise/demo: let us experience a conflict
146
144
0 commit comments