From 18666904677682b3114652a0b37410e8949600f8 Mon Sep 17 00:00:00 2001
From: Geoff Pleiss <824157+gpleiss@users.noreply.github.com>
Date: Fri, 30 Aug 2024 10:31:45 -0700
Subject: [PATCH] Update syllabus and first few slides
---
schedule/slides/00-intro-to-class.qmd | 3 +-
schedule/slides/00-version-control.qmd | 107 +++++++++++++++++--------
schedule/slides/gfx/pr_template.png | Bin 0 -> 197060 bytes
syllabus.qmd | 2 +-
4 files changed, 76 insertions(+), 36 deletions(-)
create mode 100644 schedule/slides/gfx/pr_template.png
diff --git a/schedule/slides/00-intro-to-class.qmd b/schedule/slides/00-intro-to-class.qmd
index 083ff59..198b549 100644
--- a/schedule/slides/00-intro-to-class.qmd
+++ b/schedule/slides/00-intro-to-class.qmd
@@ -195,6 +195,7 @@ Total across three components: 65 points, any way you want
2. [Assignments]{.secondary}, up to 50 points (10 each)
3. [Clickers]{.secondary}, up to 10 points
+
`effort_grade = max(65, labs + assignments + clickers)`
@@ -406,7 +407,7 @@ This course is [not]{.fourth-colour} an intro to R / python / MongoDB / SQL.
## Other resources
Canvas (minimal)
-: Quiz 0, course time/location info, links to videos from class
+: Quiz 0, grades, course time/location info, links to videos from class
Course website
: All the material (slides, extra worksheets)
diff --git a/schedule/slides/00-version-control.qmd b/schedule/slides/00-version-control.qmd
index 5ffae13..0ac71f0 100644
--- a/schedule/slides/00-version-control.qmd
+++ b/schedule/slides/00-version-control.qmd
@@ -64,6 +64,26 @@ Slack help from MDS [features](https://ubc-mds.github.io/resources_pages/slack/)
# Git and GitHub
+------
+
+*But I already know how to use git/Github...*
+
+Are you sure?
+
+* Have you used git/Github in a professional team context?
+* Do you follow a proper pull request workflow?
+* Do you know what files to track and not to track?
+* Can you get yourself unstuck from common problems?
+
+. . .
+
+
+
+*Yes. I really know how to use git/Github.*
+
+Then pull out your laptop and read my ["How To Be a Git Wizard"](https://geoffpleiss.com/git_wizard.pdf) slides. \
+I guarantee (with 99% confidence) that you will learn a new command.
+
## Why version control?
@@ -210,11 +230,15 @@ Definitely not
Any file that [YOU]{.secondary} edit should be tracked \
Any file that's [computer generated]{.secondary} should PROBABLY NOT be tracked
+
+[However, in this course you will track rendered PDFs of your homeworks/labs.
+ This makes it easier for the graders.]{.small}
:::
-. . .
+## What should be tracked?
+
A file called `.gitignore` tells `git` files or types to never track
```{{bash}}
@@ -234,10 +258,6 @@ A file called `.gitignore` tells `git` files or types to never track
*.DS_Store
```
-## What should be tracked?
-
-
-
Shortcut to track everything (use carefully):
```{{bash}}
@@ -292,15 +312,6 @@ to the same branch. Then "re-request review".
1. See Chapter 6 if you have install problems.
1. See Chapter 9 for credential caching (avoid typing a password all the time)
1. See Chapter 13 if RStudio can't find `git`
-
-## If you know all this already...
-
-
-
-:::center
-Check out my ["How To Be a Git Wizard"](https://geoffpleiss.com/git_wizard.pdf) slides to take your git game to the next level. \
-I guarantee (with 99% confidence) that you will learn an amazing new command.
-:::