Skip to content

Use instructor-note directive where appropriate #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2020
Merged
Show file tree
Hide file tree
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
22 changes: 10 additions & 12 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ belong to others.
We will do this in a progression from a small trivial fix to a change proposal
and discuss the pros and cons.


## Note to instructors

- The instructor will prepare an example repository and share the link with the
participants (see instructor guide for more details).
- This is a good example text: <https://www.gutenberg.org/ebooks/24542>
- When showing how to add a collaborator, also show how to unwatch a repo.


> ## Recap: different methods to "download" a repository
>
> - There is no need to download each file one by one.
Expand All @@ -37,6 +28,14 @@ and discuss the pros and cons.
> - Cloning copies not only the latest version but all snapshots and all branches and tags: entire history.
{: .discussion}

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


---

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

## Step 4: Resolving a conflict

### Note to instructors

```{instructor-note}
- "Non-talking instructor" prepares a conflicting commit during session (check
what the first PR does).
- Conflict can be shown as demo.

```

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

Expand Down
3 changes: 2 additions & 1 deletion creating-using-web.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ suggestions. In a larger group the instructor can demonstrate these and then
participants can try on their own and then ask questions.


## Note to instructors

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

---

Expand Down
5 changes: 2 additions & 3 deletions group-work.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@ Should I add everybody as collaborator?

## Optional exercise contributing larger changes

### Note to instructors

```{instructor-note}
- A participant shares screen and creates a repository, then instructor takes screen share and
we go through steps to contribute to that repository (without write permissions), then
screen share goes back to participant and we together review this change

```

### Exercise

Expand Down