Cherry pick workflow: improve message after conflict #62826
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ellatrix
added
the
[Type] Automated Testing
|
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 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. |
ellatrix
force-pushed
the
try/improve-cherry-pick-conflict-message
branch
2 times, most recently
from
6e97410
to
9283411
Compare
|
Size Change: 0 B Total Size: 1.76 MB ℹ️ View Unchanged
|
desrosj
approved these changes
Jun 25, 2024
| # Cherry-pick the commit. | ||
| git cherry-pick ${commitSha} | ||
| # Resolve the conflict... | ||
| git add . |
There was a problem hiding this comment.
Should we mention the contributor should make sure they don't have any unintended file changes? git add . will stage all files, so any that are not explicitly .gitignored will be added.
There was a problem hiding this comment.
Sure, can add a line suggesting to check that with git status 👍
ellatrix
force-pushed
the
try/improve-cherry-pick-conflict-message
branch
from
9283411
to
7b0a41f
Compare
|
Flaky tests detected in 7b0a41f. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/9676505818
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What?
When there's a cherry-pick conflict and the job aborts, let's leave a more helpful comment. See #62716.
Why?
How?
Testing Instructions
Testing Instructions for Keyboard
Screenshots or screencast