Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #48754 to staging 🍒 #48851

Closed
wants to merge 2 commits into from
Closed

🍒 Cherry pick PR #48754 to staging 🍒 #48851

wants to merge 2 commits into from

Conversation

os-botify[bot]
Copy link

@os-botify os-botify bot commented Sep 9, 2024

🍒 Cherry pick #48754 to staging 🍒

OSBotify and others added 2 commits September 9, 2024 23:54
@OSBotify
Update version to 9.0.31-9
7038815 
(cherry picked from commit 71f5929)
@roryabraham @OSBotify
Merge pull request #48754 from Expensify/Rory-SeparateBuildAndDeploy
36e8c9e 
[No QA] Separate build and upload Fastlane lanes

(cherry picked from commit b90a6c6)

(CP triggered by roryabraham)
@os-botify os-botify bot requested a review from a team as a code owner September 9, 2024 23:54
@os-botify
Copy link
Author

os-botify bot commented Sep 9, 2024

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 deetergp and removed request for a team September 9, 2024 23:55
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Sep 9, 2024

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

@roryabraham
Copy link
Contributor

Proposing to close this and try again in a different way to avoid conflicts: https://expensify.slack.com/archives/C07J32337/p1725926347753839?thread_ts=1725925666.433159&cid=C07J32337

@roryabraham roryabraham deleted the roryabraham-cherry-pick-staging-48754-1 branch September 10, 2024 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deetergp deetergp Awaiting requested review from deetergp

Assignees

@roryabraham roryabraham

Labels
Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@roryabraham @OSBotify