Handle merge conflicts when unrolling up PR #1426
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
|
I think build $sha expects the full SHA, which might be confusing when we're only giving short SHAs in the UI. It's not too bad -- easy to click through and get the full SHA, so maybe the smaller space is worth it. |
Mark-Simulacrum
approved these changes
Aug 26, 2022
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.
Fixes #1424
We don't need to completely bail when one rollup PR fails to merge with the previous master. This handles that more gracefully.
The message posted to PRs will now look this this:
📌 Perf builds for each rolled up PR:
previous master: 29363de9
In the case of a perf regression, run the following command for each PR you suspect might be the cause:
@rust-timer build $SHA