actions: implement predict-conflicts actions #4645
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
PastaPastaPasta
commented
Dec 29, 2021
|
It's broken it seems, pls see https://github.com/dashpay/dash/runs/4668473677?check_suite_focus=true |
see #4647 |
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 action will comment on a PR, if there is another PR that changes the same file that it changes.
See PastaPastaPasta#25 and PastaPastaPasta#26 (opened at basically the same time). As these conflict, they both get comments linking to the other PR.
Then PastaPastaPasta#27 was opened a minute or two later. This PR triggers another comment on 25 and 26 as there is now an additional PR they may conflict with, and a comment gets placed on itself.
Then PastaPastaPasta#28 was opened, but since it didn't potentially conflict with any other PRs, no comments were generated
This will be quite useful to prioritize merging between different PRs and avoiding very annoying git conflict resolutions.