Skip to content
UdemyGitPaid courseBeginner levelCertificate

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

Last updated May 2024

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.

How it compares

Against the other 108 rated Udemy courses in Git on CourseDuck:

  • Rating4.6 out of 5higher than 74% of them
  • Reviews1,403#35 of 109 by number of reviews
  • Length4.8 hourslonger than 64% of them
  • Last updatedMay 2024more recently than 51% of them

icon
Quality Score

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

Overall Score : 92 / 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]. 

icon
Udemy Discount

The discount is applied through our link. Open the course from here and Udemy's current promotional price is applied at checkout on most courses, no code to type.

Some courses are excluded from Udemy's promotions. If the price does not drop, clear your browser cookies and use the button again.

icon
Instructor Details

Brian Gorman

Brian is an experienced speaker, author, trainer, and .Net developer with MCSA: Web App Certification, MCSD: App Builder, 11 Azure certifications, and is a Microsoft Certified Trainer (MCT). Brian has a masters of science degree in computer information systems, and a bachelor of science degree in computer science. Additionally, Brian has over ten years of experience instructing college courses online in SQL databases, C#/VB .Net programming, Java programming, and Microsoft Office. Brian has also published books on Entity Framework and AZ-204 through APress.

icon
More courses by Brian Gorman

$13.99

$11.99

$84.99

icon
More Git courses

$99.99

$39.99

$14.99

$109.99

$74.99

$89.99

icon
Reviews

4.6

1,403 ratings on Udemy

Select a bar to show only those reviews.Select the bar again to show every rating.

By OHLLYSA BUSCANO on 8/14/2025

This course does a great job introducing the fundamentals of Git branching and merge conflict resolution. The explanations are clear, and the hands-on demonstrations using Git and GitHub make it easy to follow along even for beginners.

By Shirley Allen on 6/20/2023

I really enjoyed this course. Presenter was not "perfect" there were mistakes made along the way that humanised the course and made me feel that everything being taught could be achieved by me, I liked that. The lecture sizes were good & the presentation, reviews and assignments gave me enough to practice what I was being shown. Thanks for the course material - will be of benefit, not just for assignments but for the future.

By Steve Haumersen on 2/17/2022

There is a great deal of information to consume because of the flexibility of GIT and multiple ways of doing things. This course wrangles the information to provide great clarity for Branching and Merging. I had limited experience with GIT when starting this course but was able to follow along and I have learned a great deal. If you have a similar experience level when taking this course, then I would really encourage you to experience the actions presented by performing them along with Brian as he walks through the efforts. Also writing notes for the sequences of GIT commands helped me retain them. Finally, for someone with my experience level, I would suggest going through each lecture in sequence and avoid jumping around. I don't feel that I would have learned as much if I tried to just "skip to the interesting parts".

By Samet Öztürk on 10/3/2021

Course is good but it could be better if author would have show examples with a simple text file instead of couple HTML code. People other than web developers need git too. This course could have been easily under 2 hours but I think courses under 2 hours have to be free. So author chose to extend the course with unnecessary talks.

By M.Cyntia Adriaans on 2/7/2021

Absolutely brilliant delivery of Course material. I could keep up and do the work parallel on my own Git repos. I definitely feel I have a better understanding of Git and all it entails and will most certainly be able to implement my new skills immediately. It was just what I was looking for seeing that I had very little knowledge before I joined,

By Leon Reeder on 11/17/2020

This is a great tutorial covering complex and confusing concepts due to the many steps and many commands. It is taking me much longer than the the displayed times to go through each video, but that is because I am rewinding a lot to review things as I go. Concepts are sinking in though and I appreciate the presentation and attention to detail.

By Rafael Olarte on 2/27/2020

At the end of the course, the guy says: "You can now consider yourself an intermediate Git user". I agree with his statement. The contents is good. Nonetheless, this is what you should know before taking this course. When the instructor explains, he tends to ramble. So at the end of the video sessions, I didn't feel ready for explaining (to myself or to others) how to do what I was just taught to do. Therefore, for others who are planning to take this course, I recommend doing the following: Every several videos, you are going to find a summary and a quiz. Don't take the natural path of going through the videos, doing what the instructor tells you in the videos, and then taking the corresponding quiz. Instead, jump to the summary. Go through it and do what it is said in it. The summary is much more straightforward and clear than the videos. After doing what is said in the summary, go back to the videos and just watch them. Finally, take the corresponding quiz.

By Anonymized User on 9/28/2019

This a very good course in branching and merging. It shows the basic process of branching and merging which will help you get started. The accompanying activities are good ways to reinforce the lessons and doing these a few times would definitely reinforce the process.

By Ioannis Gkourtzounis on 10/16/2018

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 Fidel on 11/18/2017

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 Przemysław Olborski

Very basic course.

By Quazi Shahriar Rahman

Good git intermediate course

Showing 12 of 25 reviews