Essential tips & tricks you need to get Git up and running.

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

**Cherry picking** is reapplying changes of a selected commit into the current `HEAD`.

It’s like `git revert`, but the changes apply as is.

It’s often used when we want to apply a patch from a branch into the other branch, where merging or rebasing isn’t preferred.

## How to use `git cherry-pick`
Let’s assume there’s a product with both versions 2.x and 3.x in active development. Assume that the team is actively working on 3.x and is maintaining 2.x with the latest security patch.

The developer team updates a security patch on 3.x for a component that’s shared between both versions. We want to apply the same patch to version 2.x as well. Since the branches for versions 2.x and 3.x are different, merging them isn’t possible. We can apply the patch to version 2.x by using `git cherry-pick`.

We create a security patch as a commit in branch `v3`. We want to apply this commit on `v2`.

We use `git log` to find out the hash of the commit. Let’s assume it’s `a1b2c3d4`.

We check out the branch of version 2.x:


``` Shell
$ git checkout v2
```

Then, we use `git cherry-pick` to apply the patch onto the current branch, which is `v2`.
``` Shell
$ git cherry-pick a1b2c3d4.
```

This command creates a new commit on `v2`, with the content and message precisely the same as `a1b2c3d4`. It’s a clone of `a1b2c3d4` but applied to a different branch, at a different place.

**Cherry picking** is reapplying changes of a selected commit into the current `HEAD`.

It’s like `git revert`, but the changes apply as is.

It’s often used when we want to apply a patch from a branch into the other branch, where merging or rebasing isn’t preferred.

# How to use `git cherry-pick`
Let’s assume there’s a product with both versions 2.x and 3.x in active development. Assume that the team is actively working on 3.x and is maintaining 2.x with the latest security patch.

The developer team updates a security patch on 3.x for a component that’s shared between both versions. We want to apply the same patch to version 2.x as well. Since the branches for versions 2.x and 3.x are different, merging them isn’t possible. We can apply the patch to version 2.x by using `git cherry-pick`.

We create a security patch as a commit in branch `v3`. We want to apply this commit on `v2`.

We use `git log` to find out the hash of the commit. Let’s assume it’s `a1b2c3d4`.

We check out the branch of version 2.x:


``` Shell
$ git checkout v2
```

Then, we use `git cherry-pick` to apply the patch onto the current branch, which is `v2`.
``` Shell
$ git cherry-pick a1b2c3d4.
```

This command creates a new commit on `v2`, with the content and message precisely the same as `a1b2c3d4`. It’s a clone of `a1b2c3d4` but applied to a different branch, at a different place.

Learn to selectively apply commits to other branches.

Getting Started

Basic Command

Behind the Scenes

Essential Techniques

Flow Control

Remote and Collaboration

Handle Conflicts

Undo Changes

Rebase and Cherry Pick

Conclusion

Cherry Pick

How to use `git cherry-pick`