-
-
Notifications
You must be signed in to change notification settings - Fork 163
Conversation
Codecov Report
@@ Coverage Diff @@
## trunk #720 +/- ##
=======================================
Coverage 59.46% 59.46%
=======================================
Files 90 90
Lines 6535 6535
=======================================
Hits 3886 3886
Misses 2277 2277
Partials 372 372 Continue to review full report at Codecov.
|
we might want to use |
From https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr If it has some conflicts and can not be merged - you receive a 406 and the error message ‘Branch cannot be merged’ |
…geable branch we do this retry so we can work around a rebase causing the branch to not be mergeable for a few seconds even though it has no conflicts. so instead of retrying for every possible error we use `RetryIf` to check if the error is the one expected and try again, otherwise we just exit with the error
…try multiple times
this is required because we need to verify the status code that is returned by GitLab
Reworked to have |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good work @maxice8... Thanks a lot
Description
This function uses the
retry.Options
as documented in the system and fixes a segfaultRelated Issue
Resolves #719
How Has This Been Tested?
Merged stuff on
gitlab.alpinelinux.org
Types of changes