Course Description
Course Introduction and Overview provides an introduction to this course and the Git source control system and sets the stage for the rest of the course.
After the introduction, the first thing we do is Git Installation for both Windows and Mac.
Quick Start a very quick (15 minutes), hands-on introduction to Git. We start off by signing up for GitHub, creating a repository there, the makiing a local copy (clone), local changes (add/commit) and then update GitHub with our changes (push).
In Basic Commands, we walk through all the foundational commands needed to start a new project managed by Git (or enable Git for an existing project) all the way through making commits, including common file operations like moving and deleting files. We also cover how to exclude the wrong files from accidentally being committed and how to review your repository’s history.
With a strong foundation in place, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories.
We give great attending to Branching and Merging in Git. We start off with the simple “happy path” and learn about “Fast-Forward” merges and how to control them. The we walk through common “automatic” merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool.
With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing. In that section, we cover several rebasing examples, including how to resolve a rebase conflict.
In the Stashing section, we save our work-in-progress while we attend to more pressing issues, then pick up where we left off after that.
In the Tagging section, we mark important milestones or releases within our project. We also use those tags later for comparing differences between important milestones. We also look at how to use tags within GitHub.
All tools have installation and configuration sections to ensure no one is left behind.
This is Part#1.
Modules
- Module 1: Introduction
- Module 2: Git Installation
- Module 3: Git Quick Start
- Module 4: Text Editor Installation
- Module 5: Basic Git Commands
- Module 6: Visual Merge and Diff Tool Installation
- Module 7: Comparisons
- Module 8: Branching and Merging
- Module 9: Rebasing
- Module 10: Stashing
- Module 11: Tagging
Learning Outcomes
- Learn the key concepts of the Git source control system
- Step through the entire Git workflow
- Compare the different states in Git and compare between branches and commits
- Manage files with Git (move, rename, delete) and update files managed outside Git
- Create and fork repositories on GitHub and push changes back after working after working on them locally
- Create branches and resolve merge conflicts like a pro
Prerequisites
- Basic computer skills
- Ability to install software on your computer
- Admin rights may be required for software installation
Who Should Attend
- Anyone interested in using source control and specifically Git
- Software engineers, developers, programmers new to Git
- IT Managers or technical leads considering Git for version control on their teams
- Freelancers or other creative professionals
