What is cherry-pick in the context of version control systems?

Cherry-pick is an operation in Git that allows applying changes from a specific commit from one branch to another.

Used for:

• Applying a specific fix from one branch to another without transferring the entire history.
• Integrating functionality from an experimental branch into the main branch before its complete merge.

Syntax:

# Applying a commit with a specified hash to the current branch
git cherry-pick <commit-hash>

In case of conflicts during cherry-pick, they need to be resolved manually, similar to conflicts during merge or rebase.