Find online courses made by experts from around the world.
Take your courses with you and learn anywhere, anytime.
Learn and practice real-world skills and achieve your goals.
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.
Recent Course Updates
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.
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.
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.
Not for you? No problem.
30 day money back guarantee.
Learn on the go.
Desktop, iOS and Android.
Certificate of completion.
|Section 1: Introduction|
|Section 2: Windows Installation|
Installation Overview for WindowsPreview
Git for WindowsPreview
P4Merge for Windows Install
P4Merge for Windows Configuration
|Section 3: Mac OS X Installation|
Installation Overview for Mac OS XPreview
Apple Git on Mac OS X (Yosemite and above)Preview
TextMate 2 Install
TextMate 2 Configuration
P4Merge for Mac Install
P4Merge for Mac Configuration
|Section 4: Setup|
Course Project RepositoryPreview
|Section 5: Comparing in Git|
Git Repository Setup (for Comparing examples)
Comparing Working Directory and the Staging AreaPreview
Comparing Working Directory and the Git Repository (Last Commit)
Comparing Between the Staging Area and the Git Repository (Last Commit)
Limiting Comparisons to one File (or Path)
Comparing Between Commits
Comparing Between Local and Remote Master Branches
Comparison Section Cleanup and Push back to GitHub
|Section 6: Branching and Merging in Git|
Happy Path / Fast Forward Merges
Happy Path / Disable Fast Forward Merges
Conflicting Merges and Resolution
Section Clean up and Push back to GitHub
|Section 7: Rebasing in Git|
Simple Rebase Example
Setup a Rebasing Conflict
Abort a Rebase
Rebase Conflict and Resolution
Pull with Rebase (GitHub)
Section Cleanup and Push to GitHub
|Section 8: Updates and Errata|
Git Mac OS X Updates
|Section 9: Conclusion|
Bonus: Exclusive Student Discounts