Skip to content

🍒 Cherry pick PR #32943 to staging 🍒#32946

Merged
luacmartins merged 3 commits into
stagingfrom
luacmartins-cherry-pick-staging-32943-1
Dec 12, 2023
Merged

🍒 Cherry pick PR #32943 to staging 🍒#32946
luacmartins merged 3 commits into
stagingfrom
luacmartins-cherry-pick-staging-32943-1

Conversation

@os-botify

@os-botify os-botify Bot commented Dec 12, 2023

Copy link
Copy Markdown

🍒 Cherry pick #32943 to staging 🍒

OSBotify and others added 2 commits December 12, 2023 20:50
(cherry picked from commit 292ad52)
Fix optimistic data for distance request

(cherry picked from commit 380e687)
@os-botify
os-botify Bot requested a review from a team as a code owner December 12, 2023 20:50
@os-botify

os-botify Bot commented Dec 12, 2023

Copy link
Copy Markdown
Author

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 dangrous and removed request for a team December 12, 2023 20:50
@melvin-bot

melvin-bot Bot commented Dec 12, 2023

Copy link
Copy Markdown

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

@marcaaron marcaaron left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@luacmartins

Copy link
Copy Markdown
Contributor

Gonna merge without checklists since the code was already reviewed and we just had to resolve conflicts.

@luacmartins
luacmartins merged commit e361b77 into staging Dec 12, 2023
@luacmartins
luacmartins deleted the luacmartins-cherry-pick-staging-32943-1 branch December 12, 2023 21:12
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