Git Intro day 2 - CodeRefinery May 2021

Here, we go over the basics of git from first principles, though this is not the most basic course you can find. Previous video: We covered basics, motivation, making commits, undoing things, staging. This part 2 video goes into branching and merging, conflict resolution, inspecting history, basics of sharing repositories online, and some practical advice. However, this does not cover multi-user work or remotes (that is the next lesson, git-collaborative).

00:00 Preparation
03:49 Branching and merging
10:13 Demo: branching and merging
22:48 Exercise: branching and merging
26:44 Aside: What is the working tree?
26:52 Exercise demo: branching and merging
38:09 Q&A
57:28 Conflict resolution
1:14:09 Sharing repositiories online
1:23:36 Type-along: sharing repositories on Github
1:38:28 Inspecting history
1:40:56 Inspecting history: the Git History browser
1:42:24 Inspecting history: git grep
1:44:59 Inspecting history: git log -S
1:46:43 Inspecting history: git show
1:48:57 Inspecting history: git annotate
1:52:23 Inspecting history: git checkout -b
1:58:11 Exercise: basic archaeology commands
2:03:09 Exercise as a demo
2:19:26 Q&A about the exercise
2:22:37 Quick summary of git-bisect
2:31:36 Practical advice

This is part of the CodeRefinery May 2021 workshop. The videos are available to everyone, but may be most useful to the people who attended the workshop and want to review later.