fix: ensure pull request exists during conflict resolution #369
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
lindell
reviewed
Jul 13, 2023
There was a problem hiding this comment.
I think it's ok to change the current behavior of skip. And I agree that this change should be made 👍
The main comment on the PR is how the changes are reported back to the user. A created PR should be shown in the final output, but there are some options in how it is actually shown. Please share your thoughts in the comment on the test.
Signed-off-by: Raffael Sahli <raffael.sahli@doodle.com>
lindell
reviewed
Jul 14, 2023
Co-authored-by: Johan Lindell <johan@lindell.me>
lindell
approved these changes
Jul 15, 2023
|
Included in release v0.47.1 🎉 |
This was referenced Jan 6, 2024
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.
What does this change
Currently if run is executed and the conflict strategy skip is set it correctly bypasses the branch push.
However it does not make sure a pull request exists.
What issue does it fix
I frequently run into the issue that I get rate limited by github because I run scripts against 200+ repositories.
And if multi-gitter gets aborted at some point by me or because I shutdown my machine I am left with all branches pushed and not all pull requests opened. (Getting rate limited can lead to a loooong execution time of multi-gitter, not much we can do about it).
What I would need to fix this is to use the conflict strategy replace but I might not want that since I changed manually some branches already. Hence there is currently no option to ensure the pull requests actually exists.
This fix just makes sure that a pull request exists even when running with skip conflict resolution.
Notes for the reviewer
An alternative solution would be to add a new conflict strategy for this but I assume it's not required.
Checklist