Fix conflicts from integration-1.2 to main #353
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
Don't reuse IV between encryptions
# Conflicts: # ably/proto/crypto_test.go # ably/proto_crypto.go
tcard
reviewed
Jul 8, 2021
|
I'm struggling to understand what conflict this is resolving, can you clarify? |
Some files changes, deleted and new code added. You can check actual conflicts on active integration-1.2 to main PR |
tcard
approved these changes
Jul 8, 2021
Ok, I still don't understand what it's conflicting with, so I'll defer to @tcard. |
|
I'm slightly worried that checks failed on this branch, but we need to get the 1.2 integration branch ready to land so I'll land this PR there now so we can assess its impact on resolving the conflicts with |
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.
No description provided.