Skip to main content
GoodFirstPicks
DashboardIssuesReposLeaderboard

GoodFirstPicks by Leaveitblank © 2026

CreatorRequest a RepoPrivacy PolicyTerms of Service
Improve the manual `git cherry-pick` instructions left when performing an automatic cherry-pick fails | GoodFirstPicks

Improve the manual `git cherry-pick` instructions left when performing an automatic cherry-pick fails

WordPress/gutenberg 1 comments 14d ago
View on GitHub
lowopenScope: clearSkill match: yesWordPressJavaScriptReact

Why this is a good first issue

The issue involves improving existing documentation with clear, self-contained changes.

AI Summary

The issue aims to enhance the manual cherry-pick instructions left when automatic cherry-picks fail by making branch names more contextual, clarifying conflict resolution, specifying repository usage, and improving link formatting. The changes are straightforward and well-defined.

Issue Description

What problem does this address?

When the Auto Cherry-Pick GitHub Actions workflow fails, the following comment is left on the PR:

# Checkout the wp/7.0 branch instead of trunk.
git checkout wp/7.0

# Create a new branch for your PR.
git checkout -b my-branch

# Cherry-pick the commit.
git cherry-pick d738de8b5ccd5cfc0dceee7e7c232738ebade15c

# Check which files have conflicts.
git status

# Resolve the conflict...
# Add the resolved files to the staging area.
git status
git add .
git cherry-pick --continue

# Push the branch to the repository
git push origin my-branch

# Create a PR and set the base to the wp/7.0 branch.
# See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.

These are great but there are a few things that can be improved.

What is your proposed solution?

  1. Instead of my-branch, the instructions should include a contextual branch name. Above, a cherry-pick of d738de8b5ccd5cfc0dceee7e7c232738ebade15c is being attempted. The branch could should be some combination of commit SHA value, PR number, and target branch. Some possible values:
    • wp/7.0/cherry-pick/d738de8b5ccd5cfc0dceee7e7c232738ebade15c-from-76398
    • cherry-pick/d738de8-to-wp-7.0-from-76398 (shortened hash)
    • cherry-pick/76398-to-wp-7.0
    • etc.
  2. It should be noted that the conflict resolution step is optional/only if necessary.
  3. It's not clear if someone should perform this on their fork or the main repository. I think either is probably fine, but noting that could help someone without write access to this repo know they are free to create a PR performing the cherry-pick if they would like to.
  4. The link included in the last step (Create a PR and set the base to the wp/X.Y branch) is helpful, but the link is not clickable. That last step should be removed from the code block and placed after.
  5. Setting the correct BASE bra

GitHub Labels

[Type] EnhancementGood First Issue[Status] In Progress[Type] Build Tooling

Want to work on this?

Claim this issue to let others know you're working on it. You'll earn 10 points when you complete it!

Loading labels...

Details

Points10 pts
Difficultylow
Scopeclear
Skill Matchyes
Test Focusedno
AssigneeBingtagui404