revert Merge branch '7.0.x' into 6.2.x #501
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
… into 6.2.x branch
|
I ran The changes consist of:
|
|
I think we may be missing another change by scott, there are build failures. |
jdaugherty
approved these changes
Oct 3, 2024
jamesfredley
changed the title
jdaugherty
added a commit
that referenced
this pull request
Oct 3, 2024
This reverts commit fc4e2a3.
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.
This was caused by the github resolve merge conflict bug when merging changes up which results in the changes from the target branch also being merged into the source branch for the merge.