What is the Git Cherry-pick command and what is it used for?

Git Cherry-pick is a command that allows you to select a specific commit from one branch and apply its changes to the current branch.

It is used in the following cases:

• Taking a specific fix (hotfix) to another branch: If a critical fix was made in one branch but needs to be urgently placed in another (for example, the production branch), cherry-pick allows doing this without merging the entire branch.
• Transferring a feature or change: When you need to transfer only part of the functionality implemented in one branch to another, cherry-pick allows selecting only the relevant commits.
• Undoing a commit in the source branch: If a commit was made in the wrong branch, it can be taken with cherry-pick to the correct one, and then canceled in the original.
• Merging changes without a full merge: In some cases, when a full branch merge is undesirable due to potential conflicts or the need to select only certain changes.

Example of usage:

# Switch to the branch where you want to apply the commit
git checkout target-branch

# Apply the commit with ID commit_id
git cherry-pick commit_id

When performing cherry-pick, Git will attempt to apply changes from the selected commit. If conflicts arise, they will need to be resolved manually. Cherry-pick creates a new commit in the current branch with the same changes but a different commit ID.