chore: bump cherry-pick action to 1.1.0 #12157
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
This should now correctly identify if the PR was merged using either "Squash and merge" or "Rebase and merge" and act accordingly. Signed-off-by: Joshua Schmid <[email protected]>
github-actions
bot
added
the
chore
samugi
approved these changes
Dec 5, 2023
tzssangglass
approved these changes
Dec 6, 2023
dndx
approved these changes
Dec 6, 2023
dndx
added
the
cherry-pick kong-ee
|
Cherry-pick failed for Please cherry-pick the changes locally. git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12157-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12157-to-master-to-upstream
git checkout -b cherry-pick-12157-to-master-to-upstream
ancref=$(git merge-base 08d989cf17e2bfdb68be8137b083f671ac78ca33 083b7796edc603b0666a0ce997978df55d627258)
git cherry-pick -x $ancref..083b7796edc603b0666a0ce997978df55d627258 |
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.
Summary
This should now correctly identify if the PR was merged using either "Squash and merge" or "Rebase and merge" and act accordingly.
Fix https://konghq.atlassian.net/browse/KAG-3198