On 2019-12-11 7:35 p.m., Marek Olšák wrote: > > Merging a branch: > 1*) Check that all CI pipelines have succeeded. > 2) Rebase your local branch and force-push to your private branch. > 3) Wait ~10 seconds. > 4) Push that branch to master (git push origin HEAD:master). Gitlab will > automatically mark the MR as "Merged".
These steps 2-4 should only be used in exceptional cases, as they will bypass the CI pipeline. Normally, one should either wait for the CI pipeline to come back green before merging, or click "Merge automatically when pipeline succeeds". -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
