Skip to content

🍒 Cherry pick PR #57325 to staging 🍒#57326

Merged
luacmartins merged 2 commits intostagingfrom
mountiny-cherry-pick-staging-57325-1
Feb 24, 2025
Merged

🍒 Cherry pick PR #57325 to staging 🍒#57326
luacmartins merged 2 commits intostagingfrom
mountiny-cherry-pick-staging-57325-1

Conversation

@os-botify
Copy link

@os-botify os-botify bot commented Feb 24, 2025

🍒 Cherry pick #57325 to staging 🍒
This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:

```bash
git fetch
git checkout mountiny-cherry-pick-staging-57325-1
git cherry-pick -S -x --mainline 1 f3ee2a24055c1136fce33edb1649fac9fee8106f
```

Then manually resolve conflicts, and commit the change with `git cherry-pick --continue`. Lastly, please run:

```bash
git commit --amend -m "Update version to 9.1.4-4

(cherry picked from commit 02882ed)" -m "(CP triggered by mountiny)"
```

That will help us keep track of who triggered this CP. Once all that's done, push your changes with `git push origin mountiny-cherry-pick-staging-57325-1`, and then open this PR for review.

Note that you **must** test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.

(cherry picked from commit 02882ed)
@os-botify os-botify bot requested a review from a team as a code owner February 24, 2025 15:13
@os-botify
Copy link
Author

os-botify bot commented Feb 24, 2025

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@melvin-bot melvin-bot bot requested review from srikarparsi and removed request for a team February 24, 2025 15:14
@melvin-bot
Copy link

melvin-bot bot commented Feb 24, 2025

@srikarparsi Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

(cherry picked from commit 02882ed)

(CP triggered by mountiny)
@luacmartins luacmartins requested review from luacmartins and removed request for srikarparsi February 24, 2025 16:58
@luacmartins
Copy link
Contributor

Nothing to commit on this one, there were no conflicts locally. Gonna merge.

@luacmartins luacmartins merged commit a4bf8ef into staging Feb 24, 2025
4 of 6 checks passed
@luacmartins luacmartins deleted the mountiny-cherry-pick-staging-57325-1 branch February 24, 2025 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants