This repository has been archived by the owner on Nov 22, 2022. It is now read-only.
feat: mr merge options #695
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
Codecov Report
@@ Coverage Diff @@
## trunk #695 +/- ##
==========================================
- Coverage 60.00% 59.75% -0.25%
==========================================
Files 90 90
Lines 6458 6485 +27
==========================================
Hits 3875 3875
- Misses 2218 2245 +27
Partials 365 365
Continue to review full report at Codecov.
|
profclems
force-pushed
the
feat-mr-merge-options
branch
3 times, most recently
from
b99aa0d
to
1ed3605
Compare
This adds merge options when merging an MR. The user is given three merge options - create merge commit - squash and merge - rebase and merge NB: This options are only available on TTYs. On non-ttys, the default is to create a merge commit unless the user explicitly specifies the merge method using the available flag options
profclems
force-pushed
the
feat-mr-merge-options
branch
from
1ed3605
to
4076dd7
Compare
|
Thanks for working on this but it still has the race condition problem: [container::toolbox] ───── gl mr merge garcon ~/R/aports (glib-networking)
? Merge when pipeline succeeds? No
? What merge method would you like to use? Rebase and merge
? What's next? Submit
✓ Rebase successful
\ Merging merge request !20994 PUT https://gitlab.alpinelinux.org/api/v4/projects/alpine/aports/merge_requests/20994/merge: 406 {message: Branch cannot be merged}Trying to merge too quickly after rebasing results in this error, I work around this on my wrapper shellscript to just keep trying 2 or 3 times every 4 seconds |
|
Thanks @maxice8... I will fix that with a follow-up PR |
profclems
added a commit
that referenced
this pull request
May 12, 2021
Merge fails when mr is rebasing and it is due to glab being too fast for GitLab. To solve this, we retry the merge api 3 times at a 6s interval each Ref: #695 (comment) Resolves #407
This was referenced May 12, 2021
profclems
added a commit
to olearycrew/glab
that referenced
this pull request
Jun 12, 2021
Merge fails when mr is rebasing and it is due to glab being too fast for GitLab. To solve this, we retry the merge api 3 times at a 6s interval each Ref: profclems#695 (comment) Resolves profclems#407
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 adds merge options when merging an MR. The user is given three merge options
NB: This options are only available on TTYs. On non-ttys, the default is to create a merge commit unless the user explicitly specifies the merge method using the available flag options