Skip to content

Commit

Permalink
Update slides for online teaching
Browse files Browse the repository at this point in the history
  • Loading branch information
gcapes committed Nov 1, 2022
1 parent 37c4108 commit 8c0f7e8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 33 deletions.
29 changes: 10 additions & 19 deletions slideshow/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,11 @@ <h1 class="title">Version control with Git and GitHub</h1>
<section id="version-control-with-git-and-github" class="slide level1">
<h1>Version control with Git and GitHub</h1>
<ol type="1">
<li>Please sit near the front</li>
<li>Open the notes at <a
href="http://gcapes.github.io/git-course/">http://gcapes.github.io/git-course/</a></li>
<li>Sign up for a <a href="https://github.com/">GitHub account</a></li>
<li>Attendance is recorded using a <a
href="https://goo.gl/forms/YZJ05PzX9tPFEtuV2">feedback form</a>; there
is no sign-in sheet</li>
<li>You can use Windows or Linux on the training PCs</li>
href="https://gcapes.github.io/git-course/">http://gcapes.github.io/git-course/</a></li>
<li>Make sure you’ve completed all the setup steps at <a
href="https://gcapes.github.io/git-course/setup.html"
class="uri">https://gcapes.github.io/git-course/setup.html</a></li>
</ol>
</section>
<section id="research-related-it-services" class="slide level1">
Expand All @@ -74,17 +71,12 @@ <h1>Research-related IT services</h1>
Portal</a></li>
</ul>
</section>
<section id="housekeeping" class="slide level1">
<h1>Housekeeping</h1>
<section id="course-timing" class="slide level1">
<h1>Course timing</h1>
<ul>
<li>Fire exit</li>
<li>Toilets</li>
<li>Course timing
<ul>
<li>09:30 – 12:00 Morning session</li>
<li>09:00 – 12:00 Morning session</li>
<li>12:00 – 13:00 Lunch</li>
<li>13:00 – 16:00 Afternoon session</li>
</ul></li>
</ul>
</section>
<section id="teaching-methods" class="slide level1">
Expand All @@ -105,7 +97,7 @@ <h1>Teaching methods</h1>
<section id="getting-help" class="slide level1">
<h1>Getting help</h1>
<ul>
<li>Sticky notes
<li>Sticky notes/zoom reactions
<ul>
<li>Used for getting help and giving real-time feedback</li>
<li>Green = OK, ready to continue</li>
Expand Down Expand Up @@ -249,9 +241,8 @@ <h1>Exercises on remote collaboration</h1>
<p><a
href="http://gcapes.github.io/git-course/09-remote-collaboration/#collaborating-on-a-remote-repository">https://gcapes.github.io/git-course/09-remote-collaboration</a></p>
<p> </p>
<h2 id="feedback-formfeedback-form-attendance-record"><a
href="https://goo.gl/forms/YZJ05PzX9tPFEtuV2">Feedback form</a> =
attendance record</h2>
<h2 id="feedback-formfeedback-form"><a
href="https://goo.gl/forms/YZJ05PzX9tPFEtuV2">Feedback form</a></h2>
</section>
<section id="rebasing" class="slide level1">
<h1>Rebasing</h1>
Expand Down
23 changes: 9 additions & 14 deletions slideshow/slides.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ author: 'Gerard Capes'
---

# Version control with Git and GitHub
1. Please sit near the front
2. Open the notes at [http://gcapes.github.io/git-course/](http://gcapes.github.io/git-course/)
3. Sign up for a [GitHub account](https://github.com/)
4. Attendance is recorded using a [feedback form]; there is no sign-in sheet
5. You can use Windows or Linux on the training PCs
1. Open the notes at [http://gcapes.github.io/git-course/](https://gcapes.github.io/git-course/)
2. Make sure you've completed all the setup steps at <https://gcapes.github.io/git-course/setup.html>


[feedback form]: https://goo.gl/forms/YZJ05PzX9tPFEtuV2

Expand All @@ -24,13 +22,10 @@ author: 'Gerard Capes'

[Training courses]: https://www.staffnet.manchester.ac.uk/staff-learning-and-development/learning-pathways/professional-and-technical-development/it-skills/research-computing/research-courses/

# Housekeeping
- Fire exit
- Toilets
- Course timing
- 09:30 -- 12:00 Morning session
- 12:00 -- 13:00 Lunch
- 13:00 -- 16:00 Afternoon session
# Course timing
- 09:00 -- 12:00 Morning session
- 12:00 -- 13:00 Lunch
- 13:00 -- 16:00 Afternoon session


# Teaching methods
Expand All @@ -42,7 +37,7 @@ author: 'Gerard Capes'
- Slides will remain online after the course

# Getting help
- Sticky notes
- Sticky notes/zoom reactions
- Used for getting help and giving real-time feedback
- Green = OK, ready to continue
- Red = too fast, don't understand, computer says no etc
Expand Down Expand Up @@ -166,7 +161,7 @@ which explains why the changes were made.

&nbsp;

## [Feedback form][feedback form] = attendance record
## [Feedback form][feedback form]

# Rebasing
![](../fig/git-rebase.svg)
Expand Down

0 comments on commit 8c0f7e8

Please sign in to comment.