Gain hands-on experience with Git, exploring core concepts like initializing and branching to advanced techniques such as Git stash and cherry-picking, and complete assessments to solidify understanding.

git_docker.tar.gz

github_username

Git is one of the most widely used version control tools, and is something that every developer should become comfortable with. In this course, you will get hands-on experience working with Git so that when it comes time to use it, you’ll be ready.

You’ll start by learning some of the more fundamental concepts such as initializing a Git repository, adding files to a repository, and how to commit changes. You’ll also learn how to clone a repository, and how to create branching.

You’ll then make your way to some more advanced concepts like Git stash, cherry-picking, working with multiple repositories, pushing code, and a lot more.

To really test your understanding, you will complete four assessments that start with the core basics and go all the way up to advanced Git.

By the end of this course, you will have a proficient and working knowledge of Git which will serve you well throughout your career.

Learn Git the Hard Way

In this chapter, you will learn about:

- `git merge`
- Merge conflicts and how to resolve them
- Merges and log histories

# Remembering branches

You’ve already covered the basics of branching in the previous chapter. As you will recall, branching gives you the ability to work on parallel streams of development in the same codebase.

# Merging vs. branching

In a sense, merging is the opposite of branching. When you merge, you take two separate points in your development tree and fuse them together.

It’s important to understand merging, as it’s a routine job of a repository maintainer to merge branches together.

It's also really important to take this chapter slowly and make sure you understand every step. It's quite painful to wrap your head around merging properly. But once you do, your Git skills will improve.


Learn about merging branches in this chapter.

Introduction

Introduction to Git

Git Basics

Clone a Repository

Git Branching

Merging

Assessment #1 - Git Core

Git Stash

Git Add Interactive

Reflog

Cherry Picking

Git Rebase

Git Bisect

Assessment #2 - Advanced Local Git

Fetching and Pulling Content

Working With Multiple Repositories

Pushing Code

Git Submodules

Pull Requests

Assessment #3 - Remote Repository Management

Git Log

Squashing Commits

Bare Repositories

Cherry-Picking and Three-Way Merges

Git Hooks

Assessment #4 - Advanced Git

Finished

Introduction: Merging