GIT: Branching and Merging
About This Course
Learn the basics of working with branches and resolving merge conflicts using GIT and GitHub
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 add
git commit
git push
git pull
git fetch
git status
git log
git show
git checkout
git diff
git difftool
git merge
git mergetool
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].
Use the Bash Shell Terminal to interact with GIT
Understand Git Branching
Understand Git Merging
Course Curriculum
12 Lectures
4 Lectures
6 Lectures
3 Lectures
4 Lectures
2 Lectures
13 Lectures
13 Lectures
2 Lectures
Instructor

More Courses By
Francisco G. L. G.
Very Insightful, thx
- Helpful
- Not helpful
Jesus M. P. Q.
excelente
- Helpful
- Not helpful
Omar L. M.
buen curso, basico, pero bueno
- Helpful
- Not helpful
Richar M. F. V.
Buen curso con ejemplos y cuestionarios por cada sección
- Helpful
- Not helpful
Vishal N.
good
- Helpful
- Not helpful
Sriram J.
great course....good assignments. thankyou Brian.
While doing merge conflicts we can stick to using visual code editor , which is easier.
- Helpful
- Not helpful
Jesriel L.
Informative
- Helpful
- Not helpful
Narayanapillai A.
good
- Helpful
- Not helpful
Rick L.
I like how thorough the presentation is. Not only showing by example but explaining what and why.
- Helpful
- Not helpful
Your email address will not be published. Required fields are marked *
Daniel A.
Very good course for learning fundamentals of GIT.