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 : 90 / 100

icon
Live Chat with CourseDuck's Co-Founder for Help

Need help deciding on a git course? Or looking for more detail on Jason Taylor's Git Going with Comparing, Branching and Merging? Feel free to chat below.
Join CourseDuck's Online Learning Discord Community

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

*Some courses are excluded from this sale. Coupon not working? If the link above doesn't drop prices, clear the cookies in your browser and then click this link here.
Also, you may need to apply the coupon code directly on the cart page to get the discount.

Coupon Code

icon
Instructor Details

Jason Taylor

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
Reviews

4.5

43 total reviews

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

I thought the course was well paced and got from me from a git user of only a few commands to understanding a few of the concepts (I think Lol)Although I think it would be a very dry subject, I'd like to understand how it all works under-the-covers now.The course is MAC focused but its not a huge challenge to do everything from Linux, but a bit of help with vimdiff would be good.... (there are heaps of guides online of course).. just saying.Good course :-)

Please include the windows commands, time can be saved this way

good walkthrough the steps of git branch / merge / rebase and some of most used git commands for the command line/ git bash. would be nice to include how to use another editor beside the mac "mate" like the notepad++ or visual studio code even if it notepad++ was referenced at the begining.

Kept getting in trouble at work because I kept including other people's commits with my pushes (was always scared of using rebase) but this showed me how to deal with that. Vids are quick and with examples, while skipping all the basics.

This course is very successful for me now. I can make changes and save them and compare them with my other changes. I can send my changes to GITHUB.

Branch, yes. Merge, yes. Rebase is more confusing, and it seems really dangerous to me if more than a couple of developers are involved. Overall, course is very good.

Would be good to have one really complex escenario with rebase

Concise and to-the-point, but without taking too many short-cuts.

It's amzing course, in a short time I have many git command familer and don't afraid before time!

Good knowledge about the topics, properly explained

Clear step by step git tutorial.

The material covered was very helpful in understanding branching and merging. The pace was also great. I will definitely be taking other courses offered by the instructor.