Cherry-pick

Git cherry-pick command allows you to integrate selected, an individual commits from any branch into your current HEAD branch. This is in contrast with other ways such as merge and rebases which normally apply many commits into another branch.

Cherry-picking is just like rebasing, an advanced concept and also a powerful command. It is mainly used if you don’t want to merge the whole branch and you want some of the commits.

To use git cherry-pick, you first create two new branches and make some commits to them. Then you use the git cherry-pick <commit_hash> command to select the specific commits from one branch and apply them to the other.

Resolving Conflicts

Conflicts can occur when you merge or rebase branches that have diverged, and you need to manually resolve the conflicts before git can proceed with the merge/rebase. git status command shows the files that have conflicts, the git diff command shows the difference between the conflicting versions and the git add command is used to add the resolved files.

Task-01

Create a new branch and make some changes to it.

Use git stash to save the changes without committing them.

Switch to a different branch, make some changes, and commit them.

Use git stash pop to bring the changes back and apply them on top of the new commits.

Task-02

In version01.txt of development, the branch adds the below lines after “This is the bug fix in development branch” that you added in Day10 and reverted to this commit.

Line2>> After bug fixing, this is the new feature with minor alterations”

Commit this with the message “ Added feature2.1 in development branch”

Line3>> This is the advancement of the previous feature

Commit this with the message “ Added feature2.2 in development branch”

Line4>> Feature 2 is completed and ready for release

Commit this with the message “ Feature2 completed”

All these commits messages should be reflected in the Production branch too which will come out from the Master branch (Hint: try to rebase).

Task-03

• In the Production branch Cherry pick Commit “Added feature2.2 in development branch” and added the below lines in it:

• The line to be added after Line3>> This is the advancement of the previous feature

• Line 4>>Added a few more changes to make it more optimized.

• Commit: Optimized the feature

Here, I have checked out in the dev branch and added a new commit “Optimized the feature”

Let's complete the git in the next blog, for that you will have to watch Part-5!! 👀

~Ritul Gupta