Course Description
Git Going with Comparing, Branching and Merging
Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase, anyway?
In
this course, students will walk though comparing (diffs), branching,
merging and rebasing in Git. At the end of this course, students will
have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing, branching, merging, and rebasing.
Course Outline
Course Introduction and Overview provides an introduction to this course.
After the introduction, the first thing we do is Git Installation
for both Windows and Mac. There are dedicated sections for Windows and
Mac -- so students can jump directly to the lectures specifically
designed for their system. After the installation process, we will
download the example project repository from GitHub (clone) which we
will use throughout the course.
After installation and downloading the example project, 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.
All tools have installation and configuration sections to ensure no one is left behind.
Course Features
Presentations
provide audio/video training of conceptual ideas. Since few like
slide-ware presentations, slide-presentations are kept to a minimum.
Screencasts
provide a video of the instructor's computer system with any actions,
commands, or screens displayed and narrated. There is nearly 2 hours of
screencast based video training in order to step through each command or
action in sufficient detail.
Special Notes
This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course.
This course makes extensive use of the command line. Each command is discussed in detail, so everyone can follow along.
Curriculum
TextMate 2 Install
Abort a Rebase
Apple Git on Mac OS X (Yosemite and above)
Automatic Merges
Bonus: 2015 Special Offers
Branching Basics
Comparing Between Commits
Comparing Between Local and Remote Master Branches
Comparing Between the Staging Area and the Git Repository (Last Commit)
Comparing Working Directory and the Git Repository (Last Commit)
Comparing Working Directory and the Staging Area
Comparison Section Cleanup and Push back to GitHub
Conflicting Merges and Resolution
Course Introduction
Course Project Repository
Git for Windows
Git Repository Setup (for Comparing examples)
Happy Path / Disable Fast Forward Merges
Happy Path / Fast Forward Merges
Installation Overview for Mac OS X
Installation Overview for Windows
Limiting Comparisons to one File (or Path)
Notepad++ Configuration
Notepad++ Install
P4Merge for Mac Configuration
P4Merge for Mac Install
P4Merge for Windows Configuration
P4Merge for Windows Install
Pull with Rebase (GitHub)
Rebase Conflict and Resolution
Review
Section 1: Introduction
Section 2: Windows Installation
Section 3: Mac OS X Installation
Section 4: Setup
Section 5: Comparing in Git
Section 6: Branching and Merging in Git
Section 7: Rebasing in Git
Section 8: Conclusion
Section Clean up and Push back to GitHub
Section Cleanup and Push to GitHub
Setup a Rebasing Conflict
Simple Rebase Example
TextMate 2 Configuration
LINK FOR THE FREE COURSE
100% Off, Udemy 100% Off, Udemy Coupon, Udemy Coupon Code, Udemy course, Udemy course download, Udemy course reviews, Udemy courses, Udemy courses for free, Udemy courses free, Udemy courses free download, Udemy discount, Udemy download, Udemy education, Udemy free, Udemy free course, Udemy free courses, Udemy free online courses, Udemy online, Udemy online course, Udemy online courses, Udemy online courses review, Udemy reviews, Udemy tutorial, Udemy tutorials, Udemy.com free courses,
