GIT: Branching and Merging (Udemy.com)

Learn the basics of working with branches and resolving merge conflicts using GIT and GitHub

Created by: Brian Gorman

Produced in 2017

icon
What you will learn

  • Use the Bash Shell Terminal to interact with GIT
  • Understand Git Branching
  • Understand Git Merging
  • Set a default Merge Tool.

icon
Quality Score

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

Overall Score : 90 / 100

icon
Course Description

This course is an introduction and overview of branching and merging with GIT. By the time you complete this course, you'll be able to understand what it means to create branches locally or at a remote repository. You'll have a great command of keeping your branches up-to-date and cleaning up both your local and remote repository.

By the end of the course, you'll be in command of working with teams at GitHub and using Pull Requests to validate changes by multiple developers. You'll know how to make sure you get their changes as well, and finally you'll be able to resolve merge conflicts locally and at GitHub.
Why should you learn the command line when tools are available like Visual Studio, E-Git, GitHub for desktops, and many others? Because all tools are just wrappers around the commands. If you use the tools you should be fine, but what about when things go wrong? Who will help you then? Knowing the commands makes it EASY to go to using any IDE with Git. Not knowing the commands could be the difference between doing something wrong or just not knowing what to do at all.
Here are some of the commands we'll be interacting with during this course [and you'll get good at using them -- however -- we won't MASTER any of them, but --after this course -- you'll be able to take the study deeper on your own from here for any of these commands!].
  1. git add
  2. git commit
  3. git push
  4. git pull
  5. git fetch
  6. git status
  7. git log
  8. git show
  9. git checkout
  10. git diff
  11. git difftool
  12. git merge
  13. git mergetool
  14. git config
Additionally, this course will show you how to setup a default tool for editing, git difftool, and git mergetool [VSCode in this course, but you could use Perforce P4Merge or another tool if you want]. Who this course is for:
  • Anyone that wants to learn the commands for working with GIT to branch and merge.
  • Anyone that wants to learn about interactions with GitHub including creating a branch and working with a pull request.
  • Junior developers
  • Anyone switching to GIT

icon
Instructor Details

placeholder

I am an experienced .Net developer, previously certified as an MCSD .Net in C#.net [expired]. I have a masters of science degree in computer information systems, and a bachelor of science degree in computer science. I also have many years of experience instructing college courses online in SQL databases, C#/VB .Net programming, Java programming, and Microsoft Office. I have created many online technical training courses that can be found on various platforms like O'Reilly/InfiniteSkills, Udemy, and others. I also run MajorGuidanceSolutions, a training and consulting company ,while working fulltime as a .Net developer.

icon
More courses by Brian Gorman

ASP.Net MVC Quick Start

$11.99

GIT: Advanced commands

$11.99

Introduction to Java Programming for Online Learners

$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.5

17 total reviews

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

By Przemysław Olborski

Very basic course.

By Quazi Shahriar Rahman

Good git intermediate course

By Subhobroto Roy

Awesome course.The way the instructor has explained and demonstrate the example is really excellent.

By Michael Fidel

This course covers Git basics, specifically the git init, status, add, commit and log commands as a refresher or starting point to the main content.

The main content was git branching and merging -- both on local and remote (GitHub) repositories. I was unfamiliar with tracking remote branches on my local repo, and the examples and exercises helped to gain experience doing that.

The pivotal benefit I obtained from this course involved contributing to and managing a GitHub organization. Specifically, a third of the course involved pull requests (PR) from the local and remote (organizational) repo. It provided three scenarios and exercises where there were merge conflicts and how to resolve them on both the local and remote repos.

By Ioannis Gkourtzounis

Very good course, a solid 4,5. It is short and to the point, I would only add more strategies for workflows with branches. Some minor details could be explained in more depth. Other than that, it is indeed a great course that keeps everything short and to the point. Thank you!

By Michael Miller

I felt the course was good but went a bit slow.

By Sunil Kurapati

so far so good

By Andreas Mayer

this course is exceptionally - would just recommend to use more of git log --oneline --history --decorate --graph to see the changes that have been made as one is going to need it with its workflow

By Ian Ilhoon Chung

great so far

By Aron Onodi

A bit to much about the parts that are the basics, not branching and merging, but quite informative lectures.

By Dave Perella

Yes - we have started using Github for version tracking and code approvals and the process seems clunky to me - so I figured a course would iron things out and this appears to be just what I needed...so far.

By Ashraf ElFeky

it was pretty good, I have a little comment if you can you need to add more commend such as reset, rebase,cherry-pick, squash, so, Thank you to for the big explanation for GitHub, you did a great job