2.1 Git Intro day 2 - CodeRefinery September 2022
Channel: CodeRefinery
Date: 21/09/2022

Part 2 of the previous video: https://www.youtube.com/watch?v=HkiheYi0QsE&list=PLpLblYHCzJACqaFsfQiCWp0Wqy6qG4iau&index=2

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, merging, undoing things, staging.  This part 2 video goes into conflicts, remotes and basics of sharing repositories online, inspecting history, undoing and recovering, and some practical advice.  However, this does not cover multi-user work or remotes (that is the next lesson, git-collaborative).

https://coderefinery.github.io/git-intro/

01:37 Conflict resolution
03:06 What is a conflict?
06:18 Type-along: Making a conflict
23:09 Graphical diff-tools
25:21 Course takeaway and conflict summary
27:11 Sharing repositories online
47:06 Permission denied, public key
48:31 Cloning and deleting a repository
56:34 Small clarifications, SSH
59:58 Inspecting history
1:13:18 Exercises: inspecting history
1:16:04 Wrap-up of inspecting history
1:23:02 Git Bisect
1:25:44 Undoing and recovering
1:42:26 Exercises: undoing and recovering
1:44:24 Recovering from committing to the wrong branch (cherry-pick)
1:47:13 How much git is necessary?  What is a good balance?
1:56:34 Takeaway from days 1-2
1:57:51 Note about ssh keys for tomorrow
1:58:21 Other Q&A, feedback, and final discussion
-----

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

Playlist: https://www.youtube.com/playlist?list=PLpLblYHCzJACqaFsfQiCWp0Wqy6qG4iau

Workshop webpage: https://coderefinery.github.io/2022-09-20-workshop/

CodeRefinery: https://coderefinery.org/