Skip to content

🍒 Cherry pick PR #45674 to staging 🍒#45675

Merged
NikkiWines merged 3 commits intostagingfrom
mountiny-cherry-pick-staging-45674-1
Jul 18, 2024
Merged

🍒 Cherry pick PR #45674 to staging 🍒#45675
NikkiWines merged 3 commits intostagingfrom
mountiny-cherry-pick-staging-45674-1

Conversation

@os-botify
Copy link
Copy Markdown

@os-botify os-botify bot commented Jul 18, 2024

🍒 Cherry pick #45674 to staging 🍒

OSBotify and others added 2 commits July 18, 2024 12:30
(cherry picked from commit b28458b)
[CP Staging] Revert "Merge pull request #44724 from bernhardoj/fix/43486-new-messge-shows-every-time-add-new-message

(cherry picked from commit 0560908)
@os-botify os-botify bot requested a review from a team as a code owner July 18, 2024 12:30
@os-botify
Copy link
Copy Markdown
Author

os-botify bot commented Jul 18, 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 Gonals and removed request for a team July 18, 2024 12:31
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Jul 18, 2024

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

@mountiny mountiny self-assigned this Jul 18, 2024
@mountiny
Copy link
Copy Markdown
Contributor

Resolved the conflict, the code now matches prod

Copy link
Copy Markdown
Contributor

@NikkiWines NikkiWines left a comment

Choose a reason for hiding this comment

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

👍

@NikkiWines NikkiWines merged commit 5cde85c into staging Jul 18, 2024
@NikkiWines NikkiWines deleted the mountiny-cherry-pick-staging-45674-1 branch July 18, 2024 12:46
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