fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-15 12:08:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

docs/ci: explain what Marge saying "Manual Step encountered" means

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41497>
This commit is contained in:
Eric Engestrom 2026-05-11 20:26:56 +02:00 • committed by Marge Bot
parent 2551070ba3
commit 8b738d475f
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
docs/submittingpatches.rst
View file

@ -423,6 +423,25 @@ Do not merge someone else's MR unless you are sure they don't have a new
version that they are testing locally for instance.
**When in doubt, ask**, for instance by leaving a comment on that MR.
Common issues when merging
~~~~~~~~~~~~~~~~~~~~~~~~~~
``This branch couldn't be merged: Manual Step encountered with run-manual-jobs set to False``
The Marge script rebases the MR's branch onto the MR's target branch
(usually ``main``) and adds some extra info to the commit messages (e.g.
``Part-of:`` which contains the URL back to the MR that merged the commit).
If there is nothing to rebase and nothing to add to the commit messages
(e.g. if the user took the commits from Marge, modified them and pushed
that), then Marge will have nothing to push, skipping the creation of the
merge pipeline.
The solution is to either wait until something else is merged, causing
Marge to rebase, or remove the ``Part-of:`` trailer from at least one
commit message (the top commit is enough, not need to edit all of them),
causing Marge to add it back. Either of these causes Marge to push new
commits, falling back into the normal case.
Nominating a commit for a stable branch
---------------------------------------