Zenler Player
Your course is loading. Hang tight.
GIT: From Beginner To Fearless
Back to curriculum
0% Complete
0% Complete
Welcome to GIT: From Beginner to Fearless!
What this course is NOT going to do
Specific information about what we'll do in the rest of this introduction
Get Visual Studio Code on your machine
(Optional) Get Windows Terminal
Get GIT on your Windows machine - part 1 - Installing GIT
Get GIT on your Windows machine - part 2 - Validate GIT
Get Set up with GIT on your local machine [Linux]
Get set up with GIT on your local machine [Mac]
Making Sure VS Code is the default editor tool for GIT
Activity: Ensure VSCode is Your Default Editor for GIT
Using [git config] to set user credentials [user.name] and [user.email]
Activity: Setting GIT Credentials
Updating your version of GIT from the command line
Lets Talk about GIT - Slide Deck
Lets Talk about GIT - Part 1 - Introduction to Source Control, Local and Remote repositories
Lets Talk about GIT - Part 2 - Working Directory, Staging to Index, Committing, Push and Pull
Lets Talk about GIT - Part 3 - Remote Tracking Branches and How GIT works, leaving fear behind
Introduction and Getting started
Get an account at GitHub [if you don't already have one]
Create a new repository [public or private] at GitHub
Activity: Create a New Repository at GitHub
Cloning an existing repository to your local machine
Activity: Clone an Existing Repository to Your Local Machine
Make changes and save them locally, then make sure they go to the GitHub repository [git add], [git commit], [git push]
Activity: Change Files, Add to Staging, Commit to Local, Then Push to GitHub
Pull some changes from the repository [git pull]
Activity: Pull Changes from the GitHub Repository to Your Local Repository
Create a new local repository [git init], [git add], [git commit], [git remote]
Activity: Create a New Local Repository
Create a Remote Repository at GitHub and Add the Remote Tracking Upstream [git remote]
Activity: Get a Local Repository To Track a Remote `origin` for Pushing Changes to GitHub
Add an existing project to a repository
Activity: Add an Existing Project to your GitHub Repository
Forking an existing Repository - another way to start your own repo, but with existing code that you don't control
How to get the most out of this course
[OPTIONAL] Git Viz [Requires Visual Studio and the .net framework]
Visualizing GIT with D3
Git status command: [git status] part 1
Git status command: [git status] part 2
Git status command: [git status] part 3
Activity: What is the state of my repo?: an activity using [git status], [git log], [git show], and [git diff]
Git Ignore command [git ignore] part 1
Git Ignore command [git ignore] part 2
Git Ignore command [git ignore] part 3
Git Ignore command [git ignore] part 4
Activity: Keeping files out of the repo and including others with the .gitIgnore file
Coming Soon: I accidentally tracked a bunch of files and now I want them out of my repo. What do I do?
A single developer flow, general thoughts and flow.
[Conquered Fear] No more fear of losing work
[Review] Staging changes with the Git Add command: [git add]
[Review] Committing your changes with the Git commit command: [git commit]
[Review] Push your changes to the remote repository using the Git push command: [git push]
[Review] Get changes from the repository using the Git pull command: [git pull]
[Review] Viewing your Git commit history using the Git log command: [git log] and [git show]
Get the project [Movie Listings Web v2.0]
Coming soon: Always Remember to [git pull] main
Coming Soon: Create a new Local branch [git checkout] and [git switch]
Coming Soon: Activity: Use [git checkout] and [git switch] to create local branches
Coming Soon: Make changes, add, commit, switch to main, is your work lost?
Coming Soon: Push your changes to Remote - requires setting the upstream branch
Coming Soon: Activity: Use a Feature branch for development
Coming Soon: Create a new Remote branch and pull it to your local repository [instead of creating locally first]
Coming Soon: Introduction to Merging
Coming Soon: Create a pull request at GitHub
Coming Soon: Update your Local repository after merging
Coming Soon: Activity: Create and merge a pull request [requires completion of the `use a feature branch` activity from the previous section[
Introduction to Branching
Always remember to git pull when starting a new workflow!
Create a local branch
Make changes, add, commit, switch branches, see that things are different across branches
Introduction to merging
Checkout master, merge feature branches, and push to GitHub
Create a local branch and publish to GitHub - so that I can have pull requests/merging handled at GitHub, not locally
Creating your first individual development branch at GitHub
Fetch And Checkout Local version tracking to Remote Branch that was created at GitHub
Quick Review: Make your changes, add, commit your changes locally
Push to your branch at GitHub
Create a pull request at GitHub
Merge the Pull Request at GitHub
Fetch and Pull changes from Remote [GitHub] to local after the pull request is completed to continue working
Delete a branch from your local repository
Delete a branch at GitHub [remote] using Git Bash
Delete a branch with force delete -D
Delete And Restore Branches at GitHub
Use git prune to clean up remote references that no longer exist
Coming Soon: Activity: Clean up your local and remote branches
Setting and using a diff tool to view differences [with VSCode]
Turn off the difftool prompt
Activity: Set up VSCode to be our default difftool
Presentation: Multiple Developer Flow
Coming Soon: D3 Demo: Multiple Developer Flow
Create an organization at GitHub for your team
Setting up Teams, Projects, account privileges, and Creating and Transferring Repos to the Team
Getting our team repo setup on Local from DefaultWeb to Ultimate Default Web, and pushing out to our TEAM REMOTE repository
[Review] Create your feature branch at GitHub
[Review] Get your LOCAL repo in sync with master using git fetch and git pull, then checkout your branch. Review branches with git branch
[Review] Make changes, commit to your branch, do not push out to GitHub yet.
SIMULATE a multiple developer by making a change at GitHub [new branch, quick change, pull request, merge]
Fetch and pull master. Review our first conflict when trying to merge your change into the master branch locally.
Push, Pull Request, and merge your changes into master at GitHub after successfully resolving the merge commit locally
Setting and using a merge tool to resolve merge conflicts [with VSCode or p4Merge]
Create another conflict from dev 2 and dev 1
Sync Up Master on Local again to avoid merge conflict at GitHub
Solve the merge conflict with our default merge tool, then push and commit via pull request at GitHub
Create another conflict between dev 1 and 2 changes, Resolve at GitHub while creating the Pull Request
Coming Soon: Introduction to Rebasing
Coming soon: Local Rebase before pushing to GitHub
Coming Soon: Force Push your rebased branch to GitHub
Coming Soon: Activity: Rebase and push your local branch
Coming Soon: Local rebase with conflicts
Coming Soon: Activity: Local rebase with conflicts
Activity: Amending Commits
Amending a previous commit - changing the commit message [git commit --amend -m "new message"]
Amending a previous commit: Adding a file to a previous commit [git commit --amend]
Activity: Exploring the Reflog
[git reflog] Part 1
[git reflog] Part 2
Activity: Squash and Merge at GitHub
Squash and Merge at GitHub - Part 1
Squash and Merge at GitHub - Part 2
Squash and Merge at GitHub - Part 3
Activity: Using Aliases
Using Aliases
Always Prune on Fetch
Activity: Reset and Clean [git reset] [git clean]
Performing a soft reset [git reset]
Hard Reset and clean on current commit [git reset --hard && git clean
]
Hard Reset on a previous commit - merge into master - quick 'bug fix'
Activity: Reverting one or more commits
Git revert command [git revert]
Introduction to Rebasing
Git rebase Activity 1 [git rebase]
Git rebase Activity 2 [git rebase]
Git rebase Activity 3 [git rebase]
Activity: Cherry Picking
Cherry Picking [git cherry-pick]
Activity: Stashing Changes
Git stash command, part 1: [git stash]
Git stash command, part 2: [git stash]
Create a branch locally an push to remote [git push -u origin
]
Real Life Activity 01 - I committed to my local master, how do I fix this without losing my changes
Real Life Activity 02: I commited to local master and pushed to remote master without thinking - how do I fix this?
Real Life Activity 03 - Remove developer commits from remote master and keep consecutive commits in history.
Activity: Tagging
Tagging commits with version and other information using the Git tag command [git tag]
Additional Workflows
Activity: Ensure VSCode is your default editor for GIT
Activity: Setting GIT Credentials
Activity: Create a new repository at GitHub
Activity: Clone an existing repository to your local machine
Activity: Change files, add to staging, commit to local, then push to GitHub
Activity: Pull changes from the GitHub repository to your local repository
Welcome And Getting Your Machine Set Up
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
Very Basic GIT Information - A short lecture series on How GIT works
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
Introduction and Getting started
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
How to succeed with this course and optional tools for visualizing GIT
How to get the most out of this course
[OPTIONAL] Git Viz [Requires Visual Studio and the .net framework]
Visualizing GIT with D3
Preview
Check the state of the local repo and keep files and folders from being added to the repository
Git status command: [git status] part 1
Git status command: [git status] part 2
Git status command: [git status] part 3
Activity: What is the state of my repo?: an activity using [git status], [git log], [git show], and [git diff]
Git Ignore command [git ignore] part 1
Git Ignore command [git ignore] part 2
Git Ignore command [git ignore] part 3
Git Ignore command [git ignore] part 4
Activity: Keeping files out of the repo and including others with the .gitIgnore file
Coming Soon: I accidentally tracked a bunch of files and now I want them out of my repo. What do I do?
Basic Git Operations: A general flow for a single developer [and a review of some of the major concepts we've covered so far]
A single developer flow, general thoughts and flow.
[Conquered Fear] No more fear of losing work
[Review] Staging changes with the Git Add command: [git add]
[Review] Committing your changes with the Git commit command: [git commit]
[Review] Push your changes to the remote repository using the Git push command: [git push]
[Review] Get changes from the repository using the Git pull command: [git pull]
[Review] Viewing your Git commit history using the Git log command: [git log] and [git show]
2024: Coming Soon: Branching: Using Feature branches for your work [single developer or multiple developer with no conflicts]
Get the project [Movie Listings Web v2.0]
Coming soon: Always Remember to [git pull] main
Coming Soon: Create a new Local branch [git checkout] and [git switch]
Coming Soon: Activity: Use [git checkout] and [git switch] to create local branches
Coming Soon: Make changes, add, commit, switch to main, is your work lost?
Coming Soon: Push your changes to Remote - requires setting the upstream branch
Coming Soon: Activity: Use a Feature branch for development
Coming Soon: Create a new Remote branch and pull it to your local repository [instead of creating locally first]
2024: Coming Soon: Merging [Single Developer or Multiple Developer with no conflicts]
Coming Soon: Introduction to Merging
Coming Soon: Create a pull request at GitHub
Coming Soon: Update your Local repository after merging
Coming Soon: Activity: Create and merge a pull request [requires completion of the `use a feature branch` activity from the previous section[
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
Introduction to Branching
Always remember to git pull when starting a new workflow!
Create a local branch
Make changes, add, commit, switch branches, see that things are different across branches
Introduction to merging
Checkout master, merge feature branches, and push to GitHub
Create a local branch and publish to GitHub - so that I can have pull requests/merging handled at GitHub, not locally
Creating your first individual development branch at GitHub
Fetch And Checkout Local version tracking to Remote Branch that was created at GitHub
Quick Review: Make your changes, add, commit your changes locally
Push to your branch at GitHub
Create a pull request at GitHub
Merge the Pull Request at GitHub
Fetch and Pull changes from Remote [GitHub] to local after the pull request is completed to continue working
Cleaning Up Branches at Remote and Local
Delete a branch from your local repository
Delete a branch at GitHub [remote] using Git Bash
Delete a branch with force delete -D
Delete And Restore Branches at GitHub
Use git prune to clean up remote references that no longer exist
Coming Soon: Activity: Clean up your local and remote branches
Tools to improve our ability to work with Git and the Bash command-line Terminal
Setting and using a diff tool to view differences [with VSCode]
Turn off the difftool prompt
Activity: Set up VSCode to be our default difftool
Intermediate GIT Operations: A simple multi-developer flow with Merge Conflicts
Presentation: Multiple Developer Flow
Coming Soon: D3 Demo: Multiple Developer Flow
Create an organization at GitHub for your team
Setting up Teams, Projects, account privileges, and Creating and Transferring Repos to the Team
Getting our team repo setup on Local from DefaultWeb to Ultimate Default Web, and pushing out to our TEAM REMOTE repository
[Review] Create your feature branch at GitHub
[Review] Get your LOCAL repo in sync with master using git fetch and git pull, then checkout your branch. Review branches with git branch
[Review] Make changes, commit to your branch, do not push out to GitHub yet.
SIMULATE a multiple developer by making a change at GitHub [new branch, quick change, pull request, merge]
Fetch and pull master. Review our first conflict when trying to merge your change into the master branch locally.
Push, Pull Request, and merge your changes into master at GitHub after successfully resolving the merge commit locally
Setting and using a merge tool to resolve merge conflicts [with VSCode or p4Merge]
Create another conflict from dev 2 and dev 1
Sync Up Master on Local again to avoid merge conflict at GitHub
Solve the merge conflict with our default merge tool, then push and commit via pull request at GitHub
Create another conflict between dev 1 and 2 changes, Resolve at GitHub while creating the Pull Request
Rebasing [creating a linear commit history] - an alternative to "merge"
Coming Soon: Introduction to Rebasing
Coming soon: Local Rebase before pushing to GitHub
Coming Soon: Force Push your rebased branch to GitHub
Coming Soon: Activity: Rebase and push your local branch
Coming Soon: Local rebase with conflicts
Coming Soon: Activity: Local rebase with conflicts
Advanced GIT commands
Activity: Amending Commits
Amending a previous commit - changing the commit message [git commit --amend -m "new message"]
Amending a previous commit: Adding a file to a previous commit [git commit --amend]
Activity: Exploring the Reflog
[git reflog] Part 1
[git reflog] Part 2
Activity: Squash and Merge at GitHub
Squash and Merge at GitHub - Part 1
Squash and Merge at GitHub - Part 2
Squash and Merge at GitHub - Part 3
Activity: Using Aliases
Using Aliases
Always Prune on Fetch
Activity: Reset and Clean [git reset] [git clean]
Performing a soft reset [git reset]
Hard Reset and clean on current commit [git reset --hard && git clean <options>]
Hard Reset on a previous commit - merge into master - quick 'bug fix'
Activity: Reverting one or more commits
Git revert command [git revert]
Introduction to Rebasing
Git rebase Activity 1 [git rebase]
Git rebase Activity 2 [git rebase]
Git rebase Activity 3 [git rebase]
Activity: Cherry Picking
Cherry Picking [git cherry-pick]
Activity: Stashing Changes
Git stash command, part 1: [git stash]
Git stash command, part 2: [git stash]
Create a branch locally an push to remote [git push -u origin <branch-name>]
Real Life Activity 01 - I committed to my local master, how do I fix this without losing my changes
Real Life Activity 02: I commited to local master and pushed to remote master without thinking - how do I fix this?
Real Life Activity 03 - Remove developer commits from remote master and keep consecutive commits in history.
Using Tags
Activity: Tagging
Tagging commits with version and other information using the Git tag command [git tag]
Other Workflows
Additional Workflows
BAD CODE [DO NOT CLICK ON THESE!]
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
×
This is an unpublished lesson. This lesson will not be shown for students unless you set it as Public.
Back to Dashboard
No contents are available in this lesson!
No lessons available !
Back to Dashboard
Lesson contents locked
Enroll to unlock this lesson.
Enroll to unlock
Next Lesson