video-editlist: days 2 and 3

coderefinery · Sep 12, 2024 · 6d31bfc · 6d31bfc
1 parent 010944d
commit 6d31bfc
Showing 1 changed file with 125 additions and 115 deletions.
diff --git a/video-editlist.yaml b/video-editlist.yaml
@@ -106,18 +106,19 @@
 
 
 
-## Day 2
-#- input: raw/day2-obs.mkv
-#
-## Day 2 icebreaker
-#- output: out/day2-icebreaker.mkv
-#  title: 2.1 Day 2 icebreaker
-#  description: >
-#    The icebreaker part of day 2.
-#  time:
-#    - start: 00:10:12
-#    - stop: 00:18:08
-#
+# Day 2
+- input: raw/day2-obs.mkv
+
+# Day 2 icebreaker
+- output: out/day2-icebreaker.mkv
+  title: 2.1 Day 2 icebreaker and intro
+  description: >
+    The icebreaker part of day 2, which includes following up on some
+    questions from yesterday and an outlook for today.
+  time:
+    - start: 00:06:14
+    - stop: 00:20:28
+
 ## Day 2 intro
 #- output: out/day2-intro.mkv
 #  title: 2.2 Day 2 introduction
@@ -129,66 +130,69 @@
 #    - 00:20:42: For newcomers
 #    - stop: 00:26:16
 #
-## Git-intro day 2
-#- output: out/day2-git-intro-2.mkv
-#  title: 2.3 Git Intro day 2
-#  description: >
-#    Part 2 of the previous video: https://www.youtube.com/watch?v=sddxBsL799M&list=PLpLblYHCzJADIsbUhXSrC0qW5wDsH-F9U&index=3
-#
-#    We continue where we left off from day 1.  We advance by working
-#    locally: first, cloning a repository and doing some of the same
-#    things we did yesterday (committing, branching, etc).  Then, we
-#    clone a sample repository and use it to practice more advanced
-#    history inspection.  Then, we show and practice taking a project
-#    that isn't controlled by git, doing the "git init", and doing all
-#    of the tracking, linking to the web repository (GitHub, GitLab,
-#    etc).  The day ends with lots of practical advice on various
-#    topics.
-#
-#    https://coderefinery.github.io/git-intro/
-#  editlist:
-#    - start: 00:26:16
-#    - -: Starting words
-#    - 00:32:20: '§ Cloning a git repository and working locally'
-#    - 00:40:36: Demonstration of cloning a repository locally
-#    - 00:49:12: Exercise introduction (cloning)
-#    - stop: 00:52:05
-#    #- start: 01:18:04
-#    #- -: After exercise
-#    #- stop: ??
-#    - start: 01:27:41
-#    - -: Exercise Q&A (cloning)
-#    - 01:34:00: '§ Inspecting history'
-#    - 01:37:11: Demonstration of important commands
-#    - 01:41:04: Exercise introduction (inspecting history)
-#    - stop: 01:46:13
-#    - start: 02:08:29
-#    - -: Exercise Q&A (inspecting history)
-#    - stop: 02:19:35
-#    - start: 03:17:49
-#    - -: "Back from break, more comments on previous exercise"
-#    - 03:24:28: '§ How to turn your project into a Git repo and share it'
-#    - 03:24:55: Exercise introduction (sharing)
-#    - stop: 03:29:03
-#    - start: 03:52:50
-#    - -: Exercise Q&A (sharing)
-#    - 04:01:44: '§ Practical advice: how much git is necessary? (general Q&A)'
-#    - stop: 04:12:12
-#    - start: 04:22:43
-#    - -: General discussion and Q&A session
-#    - 04:24:57: gitignore and git status
-#    - 04:30:04: 'Branch design (when to branch) (continuation of practical advice)'
-#    - 04:36:02: How large should a commit be?
-#    - 04:38:40: '§ What to avoid'
-#    - 04:43:53: Feedback of the day and more discussion
-#    - 04:45:21: Preparation for day 3
-#    - stop: 04:50:32
-#
-#
-#
-### Day 3
-#- input: raw/day3-obs.mkv
-#
+# Git-intro day 2
+- output: out/day2-git-intro-2.mkv
+  title: 2.3 Git Intro day 2
+  description: >
+    Part 2 of the previous video: https://www.youtube.com/watch?v=yoK3p4FZ66U&list=PLpLblYHCzJAC5BCOYGsbxg9hWpVX2g8nf&index=2
+
+    We continue where we left off from day 1.  We advance by working
+    locally: first, cloning a repository and doing some of the same
+    things we did yesterday (committing, branching, etc).  Then, we
+    clone a sample repository and use it to practice more advanced
+    history inspection.  Then, we show and practice taking a project
+    that isn't controlled by git, doing the "git init", and doing all
+    of the tracking, linking to the web repository (GitHub, GitLab,
+    etc).  The day ends with lots of practical advice on various
+    topics.
+
+    https://coderefinery.github.io/git-intro/
+  editlist:
+    - start: 00:20:28
+    - -: Starting words
+    - 00:24:55: '§ Cloning a git repository and working locally'
+    #- : Demonstration of cloning a repository locally
+    - 00:34:40: Exercise introduction (cloning)
+    - stop: 00:39:13
+    #- start: 01:18:04
+    #- -: After exercise
+    #- stop: ??
+    - start: 01:04:01
+    - -: Exercise Q&A (cloning)
+    - 01:05:14: Going thourgh exercise solution
+    - stop: 01:16:39
+    - start: 01:25:51
+    - -: A bit more Q&A (and comparison of GitHub, VSCode, and command line)
+    - 001:28:56: '§ Inspecting history'
+    - 01:30:05: Demonstration of the exercise topics
+    - 01:40:36: Exercise introduction (inspecting history)
+    - stop: 01:44:35
+    - start: 02:04:23
+    - -: Exercise Q&A (inspecting history)
+    - stop: 02:13:54
+    - start: 03:11:23
+    - -: "Back from break, more comments on previous exercise"
+    - 03:13:05: '§ How to turn your project into a Git repo and share it'
+
+    - 03:25:42: Exercise introduction (sharing)
+    - stop: 03:27:44
+    - start: 03:51:00
+    - -: Exercise Q&A (sharing)
+    - 03:52:13: Thoughts on publishing work
+    - 03:55:33: '§ Practical advice: how much git is necessary? (general Q&A)'
+    - stop: 04:07:58
+    - start: 04:17:46
+    - -: General discussion and Q&A session
+    - 04:23:38: '§ What to avoid'
+    - 04:30:17: Feedback of the day and more discussion
+    - 04:31:33: Preparation for day 3
+    - stop: 04:39:17
+
+
+
+## Day 3
+- input: raw/day3-obs.mkv
+
 #- output: out/day3-icebreaker.mkv
 #  title: 3.1 Day 3 icebreaker
 #  description: >
@@ -208,49 +212,55 @@
 #  time:
 #    - start: 00:21:56
 #    - stop: 00:27:53
-#
-#
-#
-#
-#- output: out/day3-git-collab.mkv
-#  title: 3.3 Git collaborative
-#  description: >
-#      Today, we expand from using git by yourself to using it in a
-#      team.  We use Github, centralized workflows, forking on Github,
-#      pull requests, code review, commenting on pull requests,
-#      practical advice on using Git and version control in real projects,
-#      contributing to other projects, and more.  This really puts the
-#      previous two days together and lets you know how things work in
-#      bigger projects.
-#
-#      https://coderefinery.org/git-collaborative/
-#  time:
-#    - start: 00:27:53
-#    - -: Some initial discussion
-#    - 00:29:36: Collaborative distributed version control
-#    - 00:33:26: "§ Concepts around collaboration"
-#    - 00:42:21: "§ Collaborating within the same repository"
-#    - 00:42:50: Exercise preparation
-#    - 00:45:18: Exercise overview (same repository)
-#    - stop: 00:51:23
-#    - start: 01:31:45
-#    - -: Exercise demo Q&A (same repository)
-#    - 01:49:39: '§ Practicing code review (straight to exercise)'
-#    - stop: 01:57:45
-#    - start: 03:21:42
-#    - -: "§ Contributing changes to others' repositories"
-#    - 03:26:11: Demo of main exercise steps
-#    - 03:43:19: Starting the exercise (code review
-#    - stop: 03:44:59
-#    - start: 04:16:41
-#    - -: After exercise commentary
-#    - stop: 04:17:47
-#    - start: 04:26:48
-#    - -: "More general Q&A and recommendations (bottom of 'contributing changes')"
-#    - 04:51:20: Final words and preparation for day 3
-#    - stop: 04:55:52
-#
-#
+
+
+
+
+- output: out/day3-git-collab.mkv
+  title: 3.3 Git collaborative
+  description: >
+      Today, we expand from using git by yourself to using it in a
+      team.  We use Github, centralized workflows, forking on Github,
+      pull requests, code review, commenting on pull requests,
+      practical advice on using Git and version control in real projects,
+      contributing to other projects, and more.  This really puts the
+      previous two days together and lets you know how things work in
+      bigger projects.
+
+      https://coderefinery.org/git-collaborative/
+  time:
+    - start: 00:21:31
+    - -: Some initial discussion, requesting access
+    - 00:24:22: "§ Concepts around collaboration"
+    - 00:39:32: "§ Collaborating within the same repository"
+    - 00:41:23: Exercise preparation
+    - 00:50:34: Exercise introduction (same repository)
+    - stop: 00:56:20
+
+    - start: 01:15:07
+    - -: Break intro
+    - stop: 01:15:55
+
+    - start: 01:25:32
+    - -: 'Exercise demo and Q&A and § Practicing code review (straight to exercise)'
+    - stop: 02:16:48
+    # lunch
+
+    - start: 03:16:46
+    - -: "§ Contributing changes to others' repositories"
+    #- 03:26:11: Demo of main exercise steps
+    #- 03:43:19: Starting the exercise (code review
+    - stop: 03:38:23
+    - start: 03:59:27
+    - -: After exercise commentary
+    - 04:21:10: Q&A and misc topics
+    #- stop: 04:17:47
+    #- start: 04:26:48
+    #- -: "More general Q&A and recommendations (bottom of 'contributing changes')"
+    - 04:40:59: Final words and preparation for day 3
+    - stop: 04:48:10
+
+
 ### Day 4
 #- input: raw/day4-obs.mkv
 #