Revert overwritten conflicts #1356
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hazelcast#1320 had merge conflicts which lead to [some changes going missing](hazelcast#1320 (comment)) This PR re-instates these. Specifically: - reverted the problematic commit locally via GitHub desktop - discarded any security-related changes - leaving only the non-security changes to be reverted
JackPGreen
requested review from
oliverhowell and
amandalindsay
as code owners
✅ Deploy Preview for hardcore-allen-f5257d ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
github-actions bot
pushed a commit
that referenced
this pull request
Oct 31, 2024
#1320 had merge conflicts which lead to [some changes going missing](#1320 (comment)) This PR reinstates these. Specifically: - reverted the problematic commit locally via GitHub desktop - discarded any security-related changes - leaving only the non-security changes to be reverted [Related](https://hazelcast.slack.com/archives/C035HQET5/p1730377502391329). (cherry picked from commit e6ed3b5)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1320 had merge conflicts which lead to some changes going missing.
This PR reinstates these.
Specifically:
Related.