GIT: From Beginner To Fearless

Zenler Player

Your course is loading. Hang tight.

Activity: What is the state of my repo?: an activity using [git status], [git log], [git show], and [git diff]
Git status command: [git status] part 1
Git status command: [git status] part 2
Git status command: [git status] part 3
Activity: Keeping files out of the repo and including others with the .gitIgnore file
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

[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] Commit 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]

Activity: Set VSCode as our default editor
Get a text editor for use when editing files [i.e. VS Code, SublimeText, Brackets, or something else you like]
Setting the default Editor [don't worry: you can still use VI if you really want to]
Activity: Set up VSCode to be our default difftool
Setting and using a diff tool to view differences [with VSCode]
Turn off the difftool prompt

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

Create an organization at GitHub for your team
Setting up Teams, projects, account privileges, and Creating and Transferring Repos to the 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

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.

Activity: Tagging
Tagging commits with version and other information using the Git tag command [git tag]

Lesson contents locked