GIT Branching and Merging

Learn the basics of working with branches and resolving merge conflicts using GIT and GitHub
GIT Branching and Merging
File Size :
2.57 GB
Total length :
4h 16m



Brian Gorman


Last update




GIT Branching and Merging

What you’ll learn

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

GIT Branching and Merging


No, we’ll do some stuff from the ground up. However, you might want to do my FREE Git 5 day challenge first to get your feet wet and make sure this is for you.
If you can’t work with a computer, this isn’t for you.


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!].
git addgit commitgit pushgit pullgit fetchgit statusgit loggit showgit checkoutgit diffgit difftoolgit mergegit mergetoolgit 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].


Section 1: Introduction: Getting Started

Lecture 1 Welcome & Info about this course

Lecture 2 What this course won’t cover

Lecture 3 Get an account at GitHub

Lecture 4 Setup a Repo at GitHub

Lecture 5 Get GIT on your machine [Windows]

Lecture 6 Get GIT on your machine [Ubuntu Linux]

Lecture 7 Get GIT on your machine [MAC]

Lecture 8 Get VSCode for use as an editor, a diff tool, and a merge tool

Lecture 9 Setup VSCode as the default editor

Lecture 10 I already have a project, how do I add it to a REMOTE Repository

Section 2: Basic Git Flow [No Branching and only one Developer]

Lecture 11 A quick note about the repository and tools in upcoming videos

Lecture 12 Staging changes with the [git add] command

Lecture 13 Committing your changes with the [git commit] command

Lecture 14 Commit your changes on the REMOTE [GitHub] using the [git push] command

Lecture 15 Always get your latest changes using the [git pull] command

Lecture 16 Reviewing your history using the [git log] and [git show] command

Section 3: Tools to improve our command line experience for difftool and mergetool

Lecture 17 Setup VSCode as your diff tool

Lecture 18 Turning off the difftool prompt

Lecture 19 Setup VSCode as your merge tool

Section 4: Branching: Working as a single-user with Local and Remote branches

Lecture 20 Introduction to Branching

Lecture 21 Always remember to [git pull] when starting a new workflow

Lecture 22 Create a new local branch using the [git checkout] command

Lecture 23 Make changes, add, commit, and switch branches. See the difference

Section 5: Intro to Merging [complete the branching section first!]

Lecture 24 Introduction to Merging

Lecture 25 Checkout master, merge feature branch [git merge], push to GitHub [git push]

Section 6: Branching and Merging With Pull Requests [Complete sections 4 and 5 first!]

Lecture 26 Create a local branch and publish to GitHub [git push -u]

Lecture 27 Create a feature branch at GitHub

Lecture 28 Fetch and Checkout a LOCAL version tracking to REMOTE branch created at GitHub

Lecture 29 Quick Review: Make your changes, add, commit your changes locally

Lecture 30 Push your feature branch changes to GitHub

Lecture 31 Create a pull request at GitHub

Lecture 32 Merge the Pull request at GitHub

Lecture 33 Fetch and Pull changes from REMOTE [GitHub] to local after the pull request

Lecture 34 Delete a branch from LOCAL [git branch -d]

Lecture 35 Delete a Branch at GitHub [REMOTE] From Local BASH

Lecture 36 Delete a branch with a force override [git branch -D]

Lecture 37 Delete and Restore branches at GitHub

Lecture 38 Use [git prune] to clean up remote references that no longer exist

Section 7: Intermediate Git Operations: A simple multi-developer flow with merge conflicts

Lecture 39 Create an organization at GitHub for your team

Lecture 40 Setting Up for Team work, transferring a repo

Lecture 41 Get Team repo to LOCAL, and pushing to our team REMOTE

Lecture 42 [Review] Create your feature branch at GitHub

Lecture 43 [Review] Get LOCAL up to date with [git fetch]-[git pull], review w/[git branch]

Lecture 44 [Review] Make changes, commit to your branch, do not push out to GitHub yet

Lecture 45 SIMULATE a multiple developer flow by making a change at GitHub

Lecture 46 Fetch and pull master. Review a merge conflict locally

Lecture 47 Push, pull, and merge your changes into master after conflict resolution

Lecture 48 Create another conflict between dev 2 and dev 1

Lecture 49 Sync up Master on Local again to avoid merge conflict at GitHub

Lecture 50 Solve the merge conflict with merge tool, push and commit with a pull request

Lecture 51 Create another conflict and resolve directly at GitHub during creation of PR

Section 8: Conclusion

Lecture 52 Branching and Merging Wrap-Up

Lecture 53 Next Steps

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

Course Information:

Udemy | English | 4h 16m | 2.57 GB
Created by: Brian Gorman

You Can See More Courses in the IT & Software >> Greetings from

New Courses

Scroll to Top