Git Going with Comparing, Branching and Merging (Udemy.com)

Comprehensive, step-by-step guide to Comparing, Branching, Merging and Rebasing in the Git source control system

Created by: Jason Taylor

Produced in 2018

icon
What you will 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

icon
Quality Score

Content Quality
/
Video Quality
/
Qualified Instructor
/
Course Pace
/
Course Depth & Coverage
/

Overall Score : 88 / 100

icon
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.
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 this course is for:
  • 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

icon
Instructor Details

placeholder

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.

icon
More courses by Jason Taylor

Git Going Fast: One Hour Git Crash Course

$11.99

GitHub Ultimate: Master Git and GitHub - Beginner to Expert

$11.99

Jenkins 2 Bootcamp: Fully Automate Builds to Deployment 2021

$11.99

Git Complete: The definitive, step-by-step guide to Git

$11.99

Git for Geeks: Quick Git Training for Developers

$11.99

Git for Windows: Step-By-Step Mastery using Commands and GUI

$11.99

icon
More git courses

Starting with Git & GitHub

$11.99

Complete Git Guide: Understand and master Git and GitHub

$11.99

Git by Example

$11.99

Git for Absolute Beginners

$11.99

Git Smart: Enjoy Git in Unity, SourceTree & GitHub

$11.99

Git Github Gitkraken: Version Control without Command Line

$11.99

icon
Reviews

4.4

98 total reviews

5 star 4 star 3 star 2 star 1 star
% Complete
% Complete
% Complete
% Complete
% Complete

By Biswas on 11/1/2020

Very straightforward and clear explanation to follow along

By Ankit Chandra on 10/4/2020

nicely explained, thanks.

By Lakshmana Murthy on 9/12/2020

Great Course and teaching.

By Harish Kumar on 6/15/2020

great course

By Ranjan Kumar on 6/6/2020

Nice Job!

By Luigi Sartirana on 5/14/2020

Qualche difficolta' sul merging

By Dinesh Deshmukh on 4/26/2020

Average

By Andrew Little on 4/25/2020

Its a very beginner-level course. I do enjoy the instructor though as he is instruction is clear, easy to follow, and well-spoken.
Also in my opinion, he ran the 'git diff' and git difftool' too much throughout the course. However, I did find the use of the 'git mergetool' helpful.

By Ashish Agnihotri on 4/23/2020

Very nice trainer. Content is very well structured and explained.

By Suresh Vazrala on 3/17/2020

Course was great, It's good if we have some assignments also

By Colin Payne on 3/13/2020

Amazing tutorials. I have taken 3 of his courses including his bootcamp on Jenkins and plan on taking more. Excellent teacher

By Joseph Britto on 3/7/2020

Good match for me.