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 #9315 to staging 🍒 #9317

Closed
wants to merge 2 commits into from
Closed

🍒 Cherry pick PR #9315 to staging 🍒 #9317

wants to merge 2 commits into from

Conversation

OSBotify
Copy link
Contributor

@OSBotify OSBotify commented Jun 5, 2022

🍒 Cherry pick #9315 to staging 🍒

OSBotify and others added 2 commits June 5, 2022 21:45
@OSBotify
Merge pull request #9316 from Expensify/version-BUILD-99b2b85909e946e…
c33f73b 
…bf58d893eadedaf24ec0cd3a7

Update version to 1.1.71-3 on main

(cherry picked from commit 26956bb)
@AndrewGable @OSBotify
Merge pull request #9315 from rushatgabhane/fix-console-error
750bdad 
Fix console error caused by incorrect propTypes

(cherry picked from commit 99b2b85)
@OSBotify OSBotify requested a review from a team as a code owner June 5, 2022 21:45
@melvin-bot melvin-bot bot removed the request for review from a team June 5, 2022 21:45
@OSBotify
Copy link
Contributor Author

OSBotify commented Jun 5, 2022

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.

@luacmartins luacmartins mentioned this pull request Jun 6, 2022
Closed
27 tasks
@AndrewGable
Copy link
Contributor

OK I think the issue here is I tried to CP #9315 before CPing https://github.com/Expensify/App/pull/9193/files -

@rushatgabhane - This actually doesn't need to be CP-ed because both are not on staging yet, so the fix will land at the same time as the "erroring" code.

@AndrewGable AndrewGable closed this Jun 6, 2022
@AndrewGable AndrewGable deleted the OSBotify-cherry-pick-staging-9315 branch June 6, 2022 16:13
@rushatgabhane
Copy link
Member

This actually doesn't need to be CP-ed because both are not on staging yet

Makes sense. Thank you for sorting it out!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@AndrewGable AndrewGable

Labels
automerge Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @AndrewGable @rushatgabhane