Fix unresolved conflict in TransportVersion #97006
Merged
Conversation
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
Two conflicting PR's were merged
craigtaverner added >bug :Delivery/Build 
| Pinging @elastic/es-delivery (Team:Delivery) |
| Do we need to add 21 at all? Can't we just leave it at 20? |
thecoop approved these changes Jun 22, 2023
mark-vieira approved these changes Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
Two conflicting PR's were merged:
020formainonly)020for bothmainand8.9)In order to get the second one in, I removed the
auto-mergefrom the first one. This should have caused the first one to fail to merge due to git conflict, and so it would get updated to021and then merge. Sadly, both PR's got merged, so we have uncompilable code.