Fix a build failure resulting from a race condition between two PRs. #3038
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
…Each passed successfully but one unintentionally restored an import that the other had removed.
abertelrud
requested review from
aciidgh,
friedbunny and
neonichu
as code owners
|
@swift-ci please smoke test |
neonichu
approved these changes
Nov 9, 2020
mattt
approved these changes
Nov 9, 2020
|
While we're waiting for builds to finish so I can merge this: what's the best remedy for this kind of "PRs passing in the night"? In this case both PRs' builds passed, but there was a conflict when landing. I suppose I could have kicked off one more build right before merging, but the PR builds seem to take forever and and there's very rarely a problem, so it's a low return on investment. |
|
I'm going to go ahead and merge to unblock #3037 |
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.
Each passed successfully but one unintentionally restored an import that the other had removed.
These were #3029 and #3019