GIT: From Beginner To Fearless

Welcome And Getting Your Machine Set Up
17 Lessons
- Welcome to GIT: From Beginner to Fearless!
  Preview
- What this course is NOT going to do
  Preview
- Specific information about what we'll do in the rest of this introduction
  Preview
- Get Visual Studio Code on your machine
  Preview
- (Optional) Get Windows Terminal
  Preview
- Get GIT on your Windows machine - part 1 - Installing GIT
  Preview
- Get GIT on your Windows machine - part 2 - Validate GIT
  Preview
- Get Set up with GIT on your local machine [Linux]
  Preview
- Get set up with GIT on your local machine [Mac]
  Preview
- Making Sure VS Code is the default editor tool for GIT
  Preview
- Activity: Ensure VSCode is Your Default Editor for GIT
  Preview
- Using [git config] to set user credentials [user.name] and [user.email]
  Preview
- Activity: Setting GIT Credentials
  Preview
- Updating your version of GIT from the command line
  Preview
- How to get the most out of this course
  Start
- [OPTIONAL] Git Viz [Requires Visual Studio and the .net framework]
  Start
- Visualizing GIT with D3
  Preview
Very Basic GIT Information - A short lecture series on How GIT works
4 Lessons
- Lets Talk about GIT - Slide Deck
  Preview
- Lets Talk about GIT - Part 1 - Introduction to Source Control, Local and Remote repositories
  Preview
- Lets Talk about GIT - Part 2 - Working Directory, Staging to Index, Committing, Push and Pull
  Preview
- Lets Talk about GIT - Part 3 - Remote Tracking Branches and How GIT works, leaving fear behind
  Preview
Introduction and Getting Started Working with GIT for Local and Remote Repositories
17 Lessons
- Introduction and Getting started
  Start
- Get an account at GitHub [if you don't already have one]
  Preview
- Create a new repository [public or private] at GitHub
  Preview
- Activity: Create a New Repository at GitHub
  Preview
- Cloning an existing repository to your local machine
  Preview
- Activity: Clone an Existing Repository to Your Local Machine
  Preview
- Make changes and save them locally, then make sure they go to the GitHub repository [git add], [git commit], [git push]
  Preview
- Activity: Change Files, Add to Staging, Commit to Local, Then Push to GitHub
  Preview
- Pull some changes from the repository [git pull]
  Preview
- Activity: Pull Changes from the GitHub Repository to Your Local Repository
  Preview
- Create a new local repository [git init], [git add], [git commit], [git remote]
  Preview
- Activity: Create a New Local Repository
  Preview
- Create a Remote Repository at GitHub and Add the Remote Tracking Upstream [git remote]
  Preview
- Activity: Get a Local Repository To Track a Remote `origin` for Pushing Changes to GitHub
  Preview
- Add an existing project to a repository
  Preview
- Activity: Add an Existing Project to your GitHub Repository
  Preview
- Forking an existing Repository - another way to start your own repo, but with existing code that you don't control
  Preview
Check the State of the Local Repository and Keep Files and Folders From Being Added To the Repository
10 Lessons
- Git status command: [git status] part 1
  Start
- Git status command: [git status] part 2
  Start
- Git status command: [git status] part 3
  Start
- Activity: What is the State of my Repository?: An Activity Using [`git status`], [`git log`], [`git show`], and [`git diff`]
  Start
- Git Ignore command [git ignore] part 1
  Start
- Git Ignore command [git ignore] part 2
  Start
- Git Ignore command [git ignore] part 3
  Start
- Git Ignore command [git ignore] part 4
  Start
- Activity: Keeping files out of the repo and including others with the .gitIgnore file
  Start
- Coming Soon: [Conquered Fear]: I Accidentally Tracked a Bunch of Files and Now I Want Them Out of my Repository. What Do I Do?
  Start
Basic GIT Operations: A General Flow for a Single Developer [and a Review of Some of the Major Concepts We've Covered So Far]
7 Lessons
- A Single Developer Flow: General Thoughts and Flow
  Start
- [Conquered Fear] No More Fear of Losing Work
  Start
- [Review] Staging Changes with the Git Add Command [`git add`]
  Start
- [Review] Committing Your Changes With the GIT Commit Command [`git commit`]
  Start
- [Review] Push Your Changes to the Remote Repository Using the GIT Push Command: [`git push`]
  Start
- [Review] Get changes from the repository using the Git pull command: [git pull]
  Start
- [Review] Viewing your Git commit history using the Git log command: [git log] and [git show]
  Start
2017 ORIGINAL, will be removed after updates: Branching - and an Advanced Single-Developer Flow and prep for multi-developer flow using Local and Remote branches
14 Lessons
- Introduction to Branching
  Start
- Always remember to git pull when starting a new workflow!
  Start
- Create a local branch
  Start
- Make changes, add, commit, switch branches, see that things are different across branches
  Start
- Introduction to merging
  Start
- Checkout master, merge feature branches, and push to GitHub
  Start
- Create a local branch and publish to GitHub - so that I can have pull requests/merging handled at GitHub, not locally
  Start
- Creating your first individual development branch at GitHub
  Start
- Fetch And Checkout Local version tracking to Remote Branch that was created at GitHub
  Start
- Quick Review: Make your changes, add, commit your changes locally
  Start
- Push to your branch at GitHub
  Start
- Create a pull request at GitHub
  Start
- Merge the Pull Request at GitHub
  Start
- Fetch and Pull changes from Remote [GitHub] to local after the pull request is completed to continue working
  Start
2024: Coming Soon: Branching: Using Feature Branches for Your Work [Single Developer or Multiple Developers With `NO` Conflicts]
8 Lessons
- Get the project [Movie Listings Web v2.0] (***download link is under the video***)
  Start
- Coming soon: Always Remember to [`git pull`] `main` Before Starting a New Local Branch
  Start
- Coming Soon: Create a New Local Branch [`git checkout`] and [`git switch`]
  Start
- Coming Soon: Activity: Use [git checkout] and [git switch] to create local branches
  Start
- Coming Soon: Make Changes, then run commands: `git add`, `git commit`, and `git switch main`. Is your work lost?
  Start
- Coming Soon: Push Your Changes to the Remote Repository: Requires Setting the Remote Upstream Tracking Branch
  Start
- Coming Soon: Activity: Use a Feature Branch for Development
  Start
- Coming Soon: Create a New Remote Branch at GitHub, and Then Pull the Branch to Your Local Repository [Alternative to Creating a Branch Locally First]
  Start
2024: Coming Soon: Merging [Single Developer or Multiple Developer With `NO` Conflicts]
5 Lessons
- Coming Soon: Either Continue With the Project From the Last Section, or Get the Project (and Get it Into GitHub) [Movie Listings Web v2.0] (***download link is under the video***)
  Start
- Coming Soon: Introduction to Merging
  Start
- Coming Soon: Create a pull request at GitHub
  Start
- Coming Soon: Update your Local repository after merging
  Start
- Coming Soon: Activity: Create Changes, Commit, Push, Then Create and Merge a Pull Request
  Start
Rebasing [creating a linear commit history] - an alternative to "merge"
5 Lessons
- Coming Soon: Either Continue With the Project From the Last Section, or Get the Project (and Get it Into GitHub) [Movie Listings Web v2.0] (***download link is under the video***)
  Start
- Coming Soon: Introduction to Rebasing
  Start
- Coming soon: Rebase Locally Before Pushing to GitHub to Get Latest Updates [`git rebase origin/main`]
  Start
- Coming Soon: Problem After Rebase: `'n' and 'm' Commits`. Use [`git push --force-with-lease`] to Push Your Rebased Branch to GitHub
  Start
- Coming Soon: Activity: Using a Linear Commit Strategy By Utilizing Rebasing
  Start
Cleaning Up Branches at Remote and Local
6 Lessons
- Delete a Branch From Your Local Repository
  Start
- Delete a Branch at GitHub [remote] From Your Machine Using Git Bash
  Start
- Delete a branch with force delete -D
  Start
- Delete And Restore Branches at GitHub
  Start
- Use the Git Prune command to Clean Up Local Remote References That No Longer Exist [`git pull --prune`] or [`git fetch --prune`] or [`git fetch && git pull --prune`]
  Start
- Coming Soon: Activity: Clean Up Your Local And Remote Branches
  Start
Tools to Improve Our Ability to Work With GIT and the Bash Command-Line Terminal
3 Lessons
- Setting and Using VSCode to view differences as the `difftool`
  Start
- Turning Off The `difftool` Prompting
  Start
- Activity: Set Up VSCode to be Your Default DiffTool
  Start
Intermediate GIT Operations: A simple multi-developer flow with Merge Conflicts
15 Lessons
- Presentation: Multiple Developer Flow
  Start
- Create A GitHub Organization For Your Team
  Start
- Setting up Teams, Projects, account privileges, and Creating and Transferring Repos to the Team
  Start
- Getting our team repo setup on Local from DefaultWeb to Ultimate Default Web, and pushing out to our TEAM REMOTE repository
  Start
- [Review] Create your feature branch at GitHub
  Start
- [Review] Get your LOCAL repo in sync with master using git fetch and git pull, then checkout your branch. Review branches with git branch
  Start
- [Review] Make changes, commit to your branch, do not push out to GitHub yet.
  Start
- SIMULATE a multiple developer by making a change at GitHub [new branch, quick change, pull request, merge]
  Start
- Fetch and pull master. Review our first conflict when trying to merge your change into the master branch locally.
  Start
- Push, Pull Request, and merge your changes into master at GitHub after successfully resolving the merge commit locally
  Start
- Setting and using a merge tool to resolve merge conflicts [with VSCode or p4Merge]
  Start
- Create another conflict from dev 2 and dev 1
  Start
- Sync Up Master on Local again to avoid merge conflict at GitHub
  Start
- Solve the merge conflict with our default merge tool, then push and commit via pull request at GitHub
  Start
- Create another conflict between dev 1 and 2 changes, Resolve at GitHub while creating the Pull Request
  Start
Advanced GIT commands
32 Lessons
- Activity: Amending Commits
  Start
- Amending a previous commit - changing the commit message [git commit --amend -m "new message"]
  Start
- Amending a previous commit: Adding a file to a previous commit [git commit --amend]
  Start
- Activity: Exploring the Reflog
  Start
- [git reflog] Part 1
  Start
- [git reflog] Part 2
  Start
- Activity: Squash and Merge at GitHub
  Start
- Squash and Merge at GitHub - Part 1
  Start
- Squash and Merge at GitHub - Part 2
  Start
- Squash and Merge at GitHub - Part 3
  Start
- Activity: Using Aliases
  Start
- Using Aliases
  Start
- Always Prune on Fetch
  Start
- Activity: Reset and Clean [git reset] [git clean]
  Start
- Performing a soft reset [git reset]
  Start
- Hard Reset and clean on current commit [git reset --hard && git clean <options>]
  Start
- Hard Reset on a previous commit - merge into master - quick 'bug fix'
  Start
- Activity: Reverting one or more commits
  Start
- Git revert command [git revert]
  Start
- Introduction to Rebasing
  Start
- Git rebase Activity 1 [git rebase]
  Start
- Git rebase Activity 2 [git rebase]
  Start
- Git rebase Activity 3 [git rebase]
  Start
- Activity: Cherry Picking
  Start
- Cherry Picking [git cherry-pick]
  Start
- Activity: Stashing Changes
  Start
- Git stash command, part 1: [git stash]
  Start
- Git stash command, part 2: [git stash]
  Start
- Create a branch locally an push to remote [git push -u origin <branch-name>]
  Start
- Real Life Activity 01 - I committed to my local master, how do I fix this without losing my changes
  Start
- Real Life Activity 02: I commited to local master and pushed to remote master without thinking - how do I fix this?
  Start
- Real Life Activity 03 - Remove developer commits from remote master and keep consecutive commits in history.
  Start
Using Tags
2 Lessons
- Activity: Tagging
  Start
- Tagging commits with version and other information using the Git tag command [git tag]
  Start
Other Workflows
1 Lesson
- Additional Workflows
  Start
BAD CODE [DO NOT CLICK ON THESE!]
6 Lessons
- Activity: Ensure VSCode is your default editor for GIT
  Preview
- Activity: Setting GIT Credentials
  Preview
- Activity: Create a new repository at GitHub
  Preview
- Activity: Clone an existing repository to your local machine
  Preview
- Activity: Change files, add to staging, commit to local, then push to GitHub
  Preview
- Activity: Pull changes from the GitHub repository to your local repository
  Preview

GIT: From Beginner To Fearless

Become a fearless GIT master, with no more fear of losing changes, working as a team, or reverting to previous code at all.

Course Summary

Course Curriculum

Welcome And Getting Your Machine Set Up

Very Basic GIT Information - A short lecture series on How GIT works

Introduction and Getting Started Working with GIT for Local and Remote Repositories

Check the State of the Local Repository and Keep Files and Folders From Being Added To the Repository

Basic GIT Operations: A General Flow for a Single Developer [and a Review of Some of the Major Concepts We've Covered So Far]

2017 ORIGINAL, will be removed after updates: Branching - and an Advanced Single-Developer Flow and prep for multi-developer flow using Local and Remote branches

2024: Coming Soon: Branching: Using Feature Branches for Your Work [Single Developer or Multiple Developers With `NO` Conflicts]

2024: Coming Soon: Merging [Single Developer or Multiple Developer With `NO` Conflicts]

Rebasing [creating a linear commit history] - an alternative to "merge"

Cleaning Up Branches at Remote and Local

Tools to Improve Our Ability to Work With GIT and the Bash Command-Line Terminal

Intermediate GIT Operations: A simple multi-developer flow with Merge Conflicts

Advanced GIT commands

Using Tags

Other Workflows

BAD CODE [DO NOT CLICK ON THESE!]

Brian Gorman

John Smith

Highly Recommended Course. Easy to Understand, Informative, Very Well Organized. The Course is Full of Practical and Valuable for Anyone who wants to Enhance their Skills. Really Enjoyed it. Thank you!!

Course Pricing

Regular Course Price