Skip to content
This repository has been archived by the owner on Nov 22, 2022. It is now read-only.

glab might be too quick for GitLab #407

Closed
maxice8 opened this issue Dec 23, 2020 · 4 comments · Fixed by #715
Closed

glab might be too quick for GitLab #407

maxice8 opened this issue Dec 23, 2020 · 4 comments · Fixed by #715
Labels
bug Something isn't working stale

Comments

@maxice8
Copy link
Collaborator

maxice8 commented Dec 23, 2020

Description

It is possible that GitLab will send wrong information telling it is not possible to merge if a merge request merge attempt is made too quick after rebasing it

image

Expected Behavior vs Actual Behavior

For it to merge on first try

Steps to Reproduce

  1. Have a repo that only accepts rebased merge requests
  2. rebase it with glab mr rebase
  3. accept it with glab mr accept

Your Environment

  • Version used (Run glab --version): glab version 1.12.1-95-gf6476eb (2020-12-23)
  • Operating System and version: Fedora SilverBlue 33
@maxice8 maxice8 added the bug Something isn't working label Dec 23, 2020
@maxice8 maxice8 changed the title Glab might be tricked by GitLab being buggy glab might be too quick for GitLab Dec 23, 2020
@profclems
Copy link
Owner

Finally, what I expected to be brought up in the future!
I have been thinking of this lately. We would have to consider a specified number of retries for mr subcommands such as rebase, merge and approve 🤔

@maxice8
Copy link
Collaborator Author

maxice8 commented Dec 26, 2020

I found that sleeping 6 seconds between rebase and merge fixes it in most cases on gitlab.alpinelinux.org

@clemsbot
Copy link
Collaborator

This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.

@clemsbot clemsbot added the stale label Mar 10, 2021
@profclems profclems removed the stale label Mar 10, 2021
@clemsbot
Copy link
Collaborator

This issue has been automatically marked as stale because it has not had recent activity. We haven't had the time to address it yet, but we want to keep it open. This message is just a reminder for us to help triage issues.

@clemsbot clemsbot added the stale label Apr 10, 2021
profclems added a commit that referenced this issue 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
profclems added a commit to olearycrew/glab that referenced this issue 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.
Labels
bug Something isn't working stale
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants