1.2 Git Intro - CodeRefinery March 2022

Here, we go over the basics of git from first principles, though this is not the most basic course you can find. We cover basics, motivation, making commits, undoing things, staging. The 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).

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/

00:00 Introductions
01:33 Overview of the day
04:59 Motivation to version control
18:54 Basics (creating repo, adding, committing, etc.)
35:39 Exercise: recording changes
38:24 Going over the exercise
41:03 git history and log
43:31 commit messages
46:50 .gitignore
49:55 Misc topics and summary
50:56 Summary
55:10 Branching and merging
56:08 Motivation for branches
1:01:37 "git graph" alias
1:03:45 Branch basics
1:05:12 Creating and working with branches
1:11:35 Exercise: create and commit to branches
1:17:08 Going over the exercise
1:22:17 Merging branches
1:26:31 Deleting branches
1:30:00 Tags
1:34:50 Summary and Q&A
1:40:56 Conflict resolution
1:40:56 What is a conflict?
1:45:59 Continue with three branches and making a conflict
1:55:17 Wrap-up of the day, Q&A

-----

This is part of the CodeRefinery March 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=PLpLblYHCzJABxMUsrXAM4g8i2d9W4oyft
Workshop webpage: https://coderefinery.github.io/2022-03-22-workshop/
CodeRefinery: https://coderefinery.org/