Skip to content

🍒 Cherry pick PR #56476 to staging 🍒#56478

Merged
luacmartins merged 2 commits intostagingfrom
luacmartins-cherry-pick-staging-56476-1
Feb 6, 2025
Merged

🍒 Cherry pick PR #56476 to staging 🍒#56478
luacmartins merged 2 commits intostagingfrom
luacmartins-cherry-pick-staging-56476-1

Conversation

@os-botify
Copy link
Copy Markdown

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

🍒 Cherry pick #56476 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 luacmartins-cherry-pick-staging-56476-1
git cherry-pick -S -x --mainline 1 d85d0f1206b557b8023e9706609a7f46caa835d5
```

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.0.94-25

(cherry picked from commit 6e6d540)" -m "(CP triggered by luacmartins)"
```

That will help us keep track of who triggered this CP. Once all that's done, push your changes with `git push origin luacmartins-cherry-pick-staging-56476-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 6e6d540)
@os-botify os-botify bot requested a review from a team as a code owner February 6, 2025 19:53
@os-botify
Copy link
Copy Markdown
Author

os-botify bot commented Feb 6, 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 johnmlee101 and removed request for a team February 6, 2025 19:54
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Feb 6, 2025

@johnmlee101 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]

@johnmlee101
Copy link
Copy Markdown
Contributor

Is there a specific reason I was assigned? I'm not a mobile-deployer

@luacmartins luacmartins requested review from luacmartins and removed request for johnmlee101 February 6, 2025 19:58
@AndrewGable
Copy link
Copy Markdown
Contributor

Still working on improving this case, I think it was just assigned to pullerbear/random. cc @roryabraham for improvements

@AndrewGable AndrewGable requested a review from mountiny February 6, 2025 20:05
Copy link
Copy Markdown
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That main conflicting changes are in the Review and ReportUtils.ts and the resolution looks good to me

@luacmartins luacmartins merged commit e26b3a0 into staging Feb 6, 2025
2 of 4 checks passed
@luacmartins luacmartins deleted the luacmartins-cherry-pick-staging-56476-1 branch February 6, 2025 20:10
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.

5 participants