Skip to content

🍒 Cherry pick PR #36550 to staging 🍒 - #36554

Merged
AndrewGable merged 3 commits into
stagingfrom
AndrewGable-cherry-pick-staging-36550-1
Feb 15, 2024
Merged

AndrewGable merged 3 commits into
stagingfrom
AndrewGable-cherry-pick-staging-36550-1

Conversation

@os-botify

@os-botify os-botify Bot commented Feb 15, 2024

Copy link
Copy Markdown

🍒 Cherry pick #36550 to staging 🍒

OSBotify and others added 2 commits February 15, 2024 01:03
(cherry picked from commit bd69530)
…merchant-fix

fix(Violations): fix behaviour of merchant errors

(cherry picked from commit 68b9350)
@os-botify
os-botify Bot requested a review from a team as a code owner February 15, 2024 01:03
@os-botify

os-botify Bot commented Feb 15, 2024

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 chiragsalian and removed request for a team February 15, 2024 01:03
@melvin-bot

melvin-bot Bot commented Feb 15, 2024

Copy link
Copy Markdown

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

@AndrewGable
AndrewGable merged commit 22f023f into staging Feb 15, 2024
@AndrewGable
AndrewGable deleted the AndrewGable-cherry-pick-staging-36550-1 branch February 15, 2024 01:18
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