Skip to content
Snippets Groups Projects
Commit 100cb214 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

merge_into_manifest: add merge_status check before merge attempt

We had some cases where the merge job added rebases of a commit where rebasing
was not necessary at all, e.g.:
https://gitlab.com/garz-fricke/yocto/layers/meta-guf-machine/-/jobs/1270293595

This is obviously a known issue in GitLab concerning the HTTP return value of
the merge endpoint:
https://gitlab.com/gitlab-org/gitlab/-/issues/196962

Suggested workaround is to manually check merge_status and wait until it is
ready before attempting to merge the MR.
parent 1a8abc1d
No related branches found
No related tags found
1 merge request!39merge_into_manifest: add merge_status check before merge attempt
Pipeline #8181 passed with stage
in 17 seconds
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment