Gain insights into Git version control, delving into commits, branches, and remote collaboration. Learn about resolving conflicts and handling erroneous changes to manage software projects efficiently.

MBE-  Beginning Git Version Control by Thomas Makzan.png

DockerGit.tar.gz

email

name

Grouping 

Git is one of the most widely used version control tools in the software industry. Whether working on frontend or backend, native or server-side applications, every software developer should be comfortable with Git version control.

In this course, you’ll learn how Git is used in software projects and the basics of version control. Moreover, you’ll learn commits, pushing code, branches, and Git Stash. Finally, you’ll learn to use Git for remote collaboration, including reconciling conflicts and correcting erroneous changes with fetch, pull, reversion, and cherry-picking. At each step, you’ll solve quizzes to test your knowledge.

By the end of this course, you’ll have a working knowledge of Git and its use in version control. You’ll be able to proficiently and efficiently manage your future software projects.

Getting Started with Git Version Control

# The `git pull` command with `--rebase`
We can configure `git pull` with `--rebase` instead of `--merge`.
``` Shell
 $ git pull --rebase origin master
```
It’s recommended to do a `git fetch` + `git rebase` instead of using `git pull`. Note that `git pull` = `git fetch` + `git merge`.


# Fast-forward with rebase
When we learn `git merge`, we can fast-forward a left-behind branch by following the steps below.

Let’s suppose we’re in the `dev_logic` branch. We want to fast-forward the `master` branch, which is one commit behind the `dev_logic`. We can use the following commands:
``` Shell
 $ git checkout master 
 $ git merge dev_logic
```
By using `git rebase`, we can use one step to archive the same effect:
``` Shell
 $ git rebase dev_logic master
```
It means check out the `master` branch and rebase `master` onto `dev_logic`.

Learn about git pull and fast-forward with rebase as well as the difference between the merge and rebase commands.

Getting Started

Basic Command

Behind the Scenes

Essential Techniques

Flow Control

Remote and Collaboration

Handle Conflicts

Undo Changes

Rebase and Cherry Pick

Conclusion

Pull and Fast-forward with the git rebase Command

The `git pull` command with `--rebase`

Fast-forward with rebase

Pull and Fast-forward with the git rebase Command

The git pull command with --rebase

Fast-forward with rebase

The `git pull` command with `--rebase`