Merged
Conversation
This went into the wrong place due to a semantic merge conflict
aeisenberg
approved these changes
Oct 4, 2024
Contributor
aeisenberg
left a comment
There was a problem hiding this comment.
This seems to happen a lot. I'm not sure if there's a way around this (other than to check more carefully when we merge changelog notes).
Contributor
Author
|
Yeah, I think it might be worth adopting the What's particularly annoying is that the diff looks fine since it's based on the merge base. You have to manually merge in I've created an internal issue. |
Contributor
|
Thanks for catching this 🤦 |
This was referenced Oct 7, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This went into the wrong place due to a semantic merge conflict.
Merge / deployment checklist