Skip to content

fix: use GitLab auto-merge when CI pipeline blocks immediate merge#19

Open
harshs-dyte wants to merge 1 commit intospr/master/bc66056efrom
spr/master/8f39c44c
Open

fix: use GitLab auto-merge when CI pipeline blocks immediate merge#19
harshs-dyte wants to merge 1 commit intospr/master/bc66056efrom
spr/master/8f39c44c

Conversation

@harshs-dyte
Copy link
Copy Markdown
Owner

@harshs-dyte harshs-dyte commented Feb 24, 2026

When spr retargets an MR during the merge flow, GitLab triggers a new
CI pipeline which blocks the merge with 405. Instead of retrying for
30 seconds (far too short for real CI), try a direct merge a few times
for the async mergeability recalculation, then fall back to auto-merge
which queues the MR to merge when the pipeline passes.


Stack:


⚠️ Part of a stack created by spr. Do not merge manually using the UI - doing so may have unexpected results.

When spr retargets an MR during the merge flow, GitLab triggers a new
CI pipeline which blocks the merge with 405. Instead of retrying for
30 seconds (far too short for real CI), try a direct merge a few times
for the async mergeability recalculation, then fall back to auto-merge
which queues the MR to merge when the pipeline passes.

commit-id:8f39c44c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant