Git Going with Comparing Branching and Merging

Comprehensive, step-by-step guide to Comparing, Branching, Merging and Rebasing in the Git source control system
Git Going with Comparing Branching and Merging
File Size :
1.03 GB
Total length :
2h 24m



Jason Taylor


Last update




Git Going with Comparing Branching and Merging

What you’ll learn

Install Git and related tools, specifically for comparing and merging
Compare (diff) between various parts within Git (branches, commits, and more)
Create, manage, and delete branches
Merge branches and resolve conflicts
Rebase branches and resolve conflicts

Git Going with Comparing Branching and Merging


Basic Computer Skills
Ability to install software on your system
Admin rights may be required for software installation
Basic understanding of Git source control (add, commit, push and pull)


Git Going with Comparing, Branching and MergingAre 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 UpdatesOctober 17: Added Updates and Errata sectionCourse OutlineCourse 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 FeaturesPresentations 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 NotesThis 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.


Section 1: Introduction

Lecture 1 Course Introduction

Section 2: Windows Installation

Lecture 2 Installation Overview for Windows

Lecture 3 Git for Windows

Lecture 4 Notepad++ Install

Lecture 5 Notepad++ Configuration

Lecture 6 P4Merge for Windows Install

Lecture 7 P4Merge for Windows Configuration

Section 3: Mac OS X Installation

Lecture 8 Installation Overview for Mac OS X

Lecture 9 Apple Git on Mac OS X (Yosemite and above)

Lecture 10 TextMate 2 Install

Lecture 11 TextMate 2 Configuration

Lecture 12 P4Merge for Mac Install

Lecture 13 P4Merge for Mac Configuration

Section 4: Setup

Lecture 14 Course Project Repository

Section 5: Updates

Lecture 15 Update! GitHub Changes Default Branch Name

Section 6: Comparing in Git

Lecture 16 Git Repository Setup (for Comparing examples)

Lecture 17 Comparing Working Directory and the Staging Area

Lecture 18 Comparing Working Directory and the Git Repository (Last Commit)

Lecture 19 Comparing Between the Staging Area and the Git Repository (Last Commit)

Lecture 20 Limiting Comparisons to one File (or Path)

Lecture 21 Comparing Between Commits

Lecture 22 Comparing Between Local and Remote Master Branches

Lecture 23 Comparison Section Cleanup and Push back to GitHub

Section 7: Branching and Merging in Git

Lecture 24 Branching Basics

Lecture 25 Happy Path / Fast Forward Merges

Lecture 26 Happy Path / Disable Fast Forward Merges

Lecture 27 Automatic Merges

Lecture 28 Conflicting Merges and Resolution

Lecture 29 Section Clean up and Push back to GitHub

Section 8: Rebasing in Git

Lecture 30 Simple Rebase Example

Lecture 31 Setup a Rebasing Conflict

Lecture 32 Abort a Rebase

Lecture 33 Rebase Conflict and Resolution

Lecture 34 Pull with Rebase (GitHub)

Lecture 35 Section Cleanup and Push to GitHub

Section 9: Updates and Errata

Lecture 36 Git Mac OS X Updates

Section 10: Conclusion

Lecture 37 Review

Lecture 38 Bonus: Exclusive Student Discounts

Anyone that needs learn about comparing, branching, merging and rebaseing within Git,Not for Git beginner (should be taken after intro course on Git),Software engineers, developers, programmers on teams using branches

Course Information:

Udemy | English | 2h 24m | 1.03 GB
Created by: Jason Taylor

You Can See More Courses in the Developer >> Greetings from

New Courses

Scroll to Top