Autoplay
Autocomplete
Previous Lesson
Complete and Continue
CYFO Beginners Guide to Git
Introduction
Welcome (1:16)
What's the Problem Git is Trying to Solve? (2:06)
Version Control Systems
Introduction (0:19)
Ad Hoc Version Control (1:16)
Full-File vs. Diff-Based Version Control (0:31)
Categories of Version Control System (0:19)
Centralized Version Control (3:46)
Distributed Version Control Systems (2:11)
Hybrid Version Control Systems (0:38)
Quiz
Mondegreen: Git and Github (0:42)
Exercise: Create a Github Account
Getting Started With Git
Getting Started (0:13)
Exercise: Install the Github Git Tools (0:40)
Git Tools (0:23)
What is a Git Repository?
A Database of Changes (0:55)
Commits (0:48)
Local vs. Remote (0:55)
Try It: Initializing a Git Repository
The Git Index
Introduction to the Git Index (0:21)
File Tracking (0:28)
Adding Files to Git (0:43)
Ignoring Files (0:46)
Pro Tip: Ignoring Files That Have Already Been Added
Exercise: Adding Files to Git
Remotes
What is a Remote? (0:38)
Viewing the Remotes in a Git Repository (1:05)
Adding a Remote (0:26)
Removing a Remote (0:22)
Working with Multiple Remotes (0:35)
Try It: Git Remotes
Cloning
Cloning a Remote Repository (0:34)
Using Git's "Clone" Command (0:57)
Try It: git clone
Branching
What is a branch? (0:40)
The "master" Branch (0:18)
Git's "branch" Command (0:27)
Switching Between Branches (0:36)
Removing Branches (0:23)
Merging Branches Together (1:07)
Branching and the File System (0:40)
Branching Strategies (hint: there's no "right" way) (0:34)
Try It: Working With Branches
The Git Four-Command Combo (GFCC)
What is the GFCC? (0:41)
git add . (0:26)
Commit (0:48)
Pull (1:03)
Push (1:24)
Try It: The Git Four Command Combo (GFCC)
gitk
gitk and Visually Managing Your Repository (0:36)
Introduction to Gitk (1:44)
Creating Tags (0:24)
Resetting Branches (0:34)
Try It: Using gitk (0:27)
Viewing All Branches at Once
Resolving Merge Conflicts
What are Merge Conflicts? (1:37)
Fixing Merge Conflicts (0:14)
Manual Merging (0:22)
Using Mergetool (1:08)
Merging using KDiff3 (0:25)
Try It: Fixing Merge Conflicts
Wrap-Up
What We Covered (0:48)
Teach online with
Fixing Merge Conflicts
Lesson content locked
If you're already enrolled,
you'll need to login
.
Enroll in Course to Unlock