git-github-cherry-pick

To cherry-pick a commit, you apply specific Git commits from a source branch onto your current branch using the commit SHA. This selective code integration allows targeted bug fixes without merging the entire branch history.

Backporting a bug fix is best done by cherry-picking the specific commit SHA from the feature branch onto the main branch. This applies only the targeted fix immediately, avoiding the integration of unrelated feature changes.

To resolve conflicts during a cherry-pick, you must manually fix the conflicting files in your working directory, stage the changes, and continue the process. The Skill provides detailed strategies for handling these code integration conflicts.

Yes, you can cherry-pick a range of commits or apply merge commits in Git. This Skill supports single commit, range, and merge commit cherry-picking for selective application across branches.

You do not need the GitHub CLI to cherry-pick commits, as the process requires only the Git command-line interface. The GitHub CLI is optional and specifically used for PR-related operations after applying the commit.

You should use Git cherry-pick instead of a full branch merge when you need to backport specific fixes or integrate isolated features. It allows targeted code integration without pulling in the entire commit history of the source branch.