Git Going with Comparing, Branching and Merging
4.4 (57 ratings)
Instead of using a simple lifetime average, Udemy calculates a course's star rating by considering a number of different factors such as the number of ratings, the age of ratings, and the likelihood of fraudulent ratings.
1,604 students enrolled
Wishlisted Wishlist

Please confirm that you want to add Git Going with Comparing, Branching and Merging to your Wishlist.

Add to Wishlist

Git Going with Comparing, Branching and Merging

Comprehensive, step-by-step guide to Comparing, Branching, Merging and Rebasing in the Git source control system
4.4 (57 ratings)
Instead of using a simple lifetime average, Udemy calculates a course's star rating by considering a number of different factors such as the number of ratings, the age of ratings, and the likelihood of fraudulent ratings.
1,604 students enrolled
Created by Jason Taylor
Last updated 8/2017
Current price: $10 Original price: $50 Discount: 80% off
5 hours left at this price!
30-Day Money-Back Guarantee
  • 2 hours on-demand video
  • 1 Article
  • 1 Supplemental Resource
  • Full lifetime access
  • Access on mobile and TV
  • Certificate of Completion
What Will I 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
View Curriculum
  • 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 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

  • October 17: Added Updates and Errata section

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.

Who is the target audience?
  • 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
Students Who Viewed This Course Also Viewed
Curriculum For This Course
37 Lectures
1 Lecture 04:53
Windows Installation
6 Lectures 21:55

Notepad++ Install

Notepad++ Configuration

P4Merge for Windows Install

P4Merge for Windows Configuration
Mac OS X Installation
6 Lectures 14:26

TextMate 2 Install

TextMate 2 Configuration

P4Merge for Mac Install

P4Merge for Mac Configuration
1 Lecture 03:08
Comparing in Git
8 Lectures 21:31
Git Repository Setup (for Comparing examples)

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
Branching and Merging in Git
6 Lectures 34:01

Happy Path / Fast Forward Merges

Happy Path / Disable Fast Forward Merges

Automatic Merges

Conflicting Merges and Resolution

Section Clean up and Push back to GitHub
Rebasing in Git
6 Lectures 23:34
Simple Rebase Example

Setup a Rebasing Conflict

Abort a Rebase

Rebase Conflict and Resolution

Pull with Rebase (GitHub)

Section Cleanup and Push to GitHub
Updates and Errata
1 Lecture 00:00
Git Mac OS X Updates
2 pages
2 Lectures 07:43

Bonus: Exclusive Student Discounts
About the Instructor
Jason Taylor
4.3 Average rating
13,333 Reviews
136,008 Students
17 Courses
Lead Software Engineer, Dev Trainer (17 courses,12k reviews)

With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems.