diff --git a/video-editlist.yaml b/video-editlist.yaml index 3298c4b..a593fb7 100644 --- a/video-editlist.yaml +++ b/video-editlist.yaml @@ -27,85 +27,85 @@ # - end: 00:19:32 -## Intro -#- output: out/day1-intro.mkv -# title: 1.1 Intro -# description: > -# The introduction to this workshop, explaining general mechanics -# and what CodeRefinery is. -# -# https://github.com/coderefinery/workshop-intro/blob/master/livestream.md -# time: -# - start: 00:20:53 -# - stop: 42:00 -# -## Git-intro day 1 -#- output: out/day1-git-intro-1.mkv -# title: 1.2 Git Intro (day 1) -# description: > -# Here, we go over the basics of git from first principles, using -# the GitHub web interface. First, we talk about basic motivation -# about why version control. Then, we use the GitHub web interface -# to understand the basics of history, branches, commits, and -# merges, conflict resolution (online), and how everything fits -# together. This isn't how normal work would happen, but it's a -# much easier starting point. Part 2 (on day 2) goes to local work -# using all the same concepts we learned today. -# -# Multi-user work and remotes is the next lesson, git-collaborative, -# on day 3. -# -# There are two external videos which are excluded from this -# recording. You can find the link to them in the table of contents -# below. -# -# https://coderefinery.github.io/git-intro/ -# -# time: -# - start: 00:42:14 -# - -: Overview of the day -# - 00:45:11: Introduction, overview of lesson -# - 00:47:47: '§ Motivation to version control' -# - 00:56:31: '§ Browsing an existing project' -# - 01:01:26: Exercise introduction (Browsing) -# - stop: 01:05:15 -# - start: 01:24:47 -# - -: Exercise follow-up (Browsing) -# - stop: 01:25:36 -# - start: 01:34:40 -# - 01:36:01: Going through the exercise (Browsing) -# - 01:43:03: '§ Committing changes' -# - 01:52:22: Exercise introduction (Committing) -# #- stop: 01:53:11 -# #- start: 02:14:17 -# - stop: 01:53:11 -# - start: 02:14:17 -# - -: Going over the exercise (Committing) -# - stop: 02:19:17 -# - start: 03:19:43 -# - -: Quick recap so far (and Q&A) -# - 03:26:06: VS Code demo -# - 03:33:18: '§ Merging changes' -# - 03:37:45: Exercise introduction (Merging) -# - stop: 03:42:44 -# - start: 04:04:05 -# - -: Going over the exercise (Merging) -# - stop: 04:13:40 -# - start: 04:19:11 -# - -: 'Demo: create a pull request across repositories' -# - 04:22:30: Create new branch in coderefinery/recipe-book and open pull request -# - 04:27:23: Create new branch in [other-repo]/recipe-book and open pull request -# - 04:30:01: Looking at the two pull requests -# - 04:32:20: Try to merge the conflicting PR. Resolve the conflict -# - 04:37:08: Summary -# - 04:38:05: Q&A -# - 04:40:35: Feedback and more Q&A -# - 04:42:39: Outlook for tomorrow -# - stop: 04:49:30 -# -# -# -# +# Intro +- output: out/day1-intro.mkv + title: 1.1 Intro + description: > + The introduction to this workshop, explaining general mechanics + and what CodeRefinery is. + + https://github.com/coderefinery/workshop-intro/blob/master/livestream.md + time: + - start: 00:15:25 + - stop: 00:39:15 + +# Git-intro day 1 +- output: out/day1-git-intro-1.mkv + title: 1.2 Git Intro (day 1) + description: > + Here, we go over the basics of git from first principles, using + the GitHub web interface. First, we talk about basic motivation + about why version control. Then, we use the GitHub web interface + to understand the basics of history, branches, commits, and + merges, conflict resolution (online), and how everything fits + together. This isn't how normal work would happen, but it's a + much easier starting point. Part 2 (on day 2) goes to local work + using all the same concepts we learned today. + + Multi-user work and remotes is the next lesson, git-collaborative, + on day 3. + + There are two external videos which are excluded from this + recording. You can find the link to them in the table of contents + below. + + https://coderefinery.github.io/git-intro/ + + time: + - start: 00:39:15 + - -: Overview of the day + - 00:45:00: '§ Motivation to version control' + - 00:55:59: '§ Browsing an existing project' + - 01:01:07: Exercise introduction (Browsing) + - stop: 01:04:05 + - start: 01:23:24 + - -: Exercise follow-up (Browsing) + - stop: 01:24:21 + - start: 01:34:30 + - -: Going through the exercise (Browsing) + - 01:42:38: '§ Committing changes' + - 01:47:26: Exercise introduction (Committing) + - stop: 01:50:04 + - start: 02:08:21 + - -: Going over the exercise (Committing) + - stop: 02:18:20 + # lunch + - start: 03:13:35 + - -: Quick recap so far (and Q&A) + - 03:15:29: '§ Merging changes' + - 03:23:28: Demo of the exercise topcis (Merging) + - 03:26:20: Exercise introduction (Merging) + - stop: 03:28:34 + - start: 03:48:38 + - -: Going over the exercise (Merging) + - 03:56:49: Looking at more pull requests and discussing what this all means + - 04:01:19: Q&A from notes + - stop: 04:09:48 + - start: 04:19:30 + - -: Demonstration of creating a pull req conflict + - 04:21:45: Create new branch and add commit + - 04:23:20: Create new commit on main branch + - 04:24:04: Create a new pull request from new branch → main branch and discuss + - 04:25:56: Try to resolve the conflicting change + - 04:28:08: Summary + - 04:30:27: Big picture of the day + - 04:31:51: Q&A, feedback of the day + - 04:41:24: News of day 1, preparation for day 2 + - stop: 04:44:30 + + + + ## Day 2 #- input: raw/day2-obs.mkv #