Master comparing, branching, merging, and rebasing in Git with this step-by-step guide. Enhance your Git skills and handle merges like a pro.
This course is all about using Git effectively. It teaches you how to compare commits, branch efficiently, merge with ease, and rebase like a pro. Perfect for beginners, the course offers step-by-step guidance so you won't feel lost at any point!
Comprehensive, step-by-step guide to Comparing, Branching, Merging and Rebasing in the Git source control system
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.
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
1 Lectures
6 Lectures
6 Lectures
1 Lectures
1 Lectures
8 Lectures
6 Lectures
6 Lectures
1 Lectures
2 Lectures
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...
The course is very good to understand. I like very much
good explanation on merge
Too slow.
good
topic abt cherry pick is missing, lit bit excersise will make course interesting
Course content is good
Excellent
A good course on the complex subject of branching and merging in Git, in. Nicely paced and clear descriptions of the topics.
Excellent so far! Other tutorial video courses gloss over (or trivialize) the prep steps, particularly how to install the software that is to be used during the course. More often than not, I have run into difficulty with just setting up the environment and prerequisites on my PC and then installing the software that I hit a brick wall and am unable to proceed with the rest of the course. That can be very frustrating, when the instructor assumes that the software installation is easy for everyone, when often times it's not. (One prime example is the beginner course on Docker; installing Docker can be fraught with pitfalls, if your machine is not running the proper version of Windows OS, and if you don't have certain software components also installed, and with things enabled.)
Your email address will not be published. Required fields are marked *
Serhii V.
The course is okay, but it could be better. It doesn’t have a clear structure and doesn’t show how to work with remote branches. It only shows how to work with the master branch. It also doesn’t explain what we see and what it means in the console when we’re resolving conflicts.