Workflows: Improve manual cherry-pick instructions on conflict#76587
Workflows: Improve manual cherry-pick instructions on conflict#76587Bingtagui404 wants to merge 2 commits intoWordPress:trunkfrom
Conversation
- Use a contextual branch name instead of `my-branch` - Mark conflict resolution steps as optional - Clarify that the cherry-pick can be done from a fork - Move the documentation link outside the code block for clickability - Add `gh pr create --base` command as an alternative Closes WordPress#76576
|
Warning: Type of PR label mismatch To merge this PR, it requires exactly 1 label indicating the type of PR. Other labels are optional and not being checked here.
Read more about Type labels in Gutenberg. Don't worry if you don't have the required permissions to add labels; the PR reviewer should be able to help with the task. |
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the Unlinked AccountsThe following contributors have not linked their GitHub and WordPress.org accounts: @Bingtagui404. Contributors, please read how to link your accounts to ensure your work is properly credited in WordPress releases. If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
github-actions
bot
added
the
First-time Contributor
|
👋 Thanks for your first Pull Request and for helping build the future of Gutenberg and WordPress, @Bingtagui404! In case you missed it, we'd love to have you join us in our Slack community. If you want to learn more about WordPress development in general, check out the Core Handbook full of helpful information. |
Use array.join() to build the comment body instead of a multiline template literal, avoiding YAML indentation issues with actionlint.
1 participant
What?
Closes #76576
Improves the manual cherry-pick instructions left as a comment when the automatic cherry-pick workflow fails.
Why?
The current instructions have several usability issues: a generic branch name, unclear whether conflict resolution is needed, no mention of fork support, a non-clickable documentation link, and no GitHub CLI alternative for creating the PR.
How?
Updated the conflict comment template in
cherry-pick-wp-release.ymlwith 5 improvements:cherry-pick/{pr_number}-to-wp-{version}instead ofmy-branchgh pr create --base wp/X.Y --webas an alternative to manually setting the base branchTesting Instructions
Backport to WP X.Y Beta/RClabel.Use of AI Tools
This PR was authored with the assistance of Claude Code (AI coding assistant). The change was reviewed and validated by the contributor.