"Allowed to merge" blocks manual merge of merge request
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
We want a workflow where every change is performed via a merge request and direct commits on the master
branch is blocked. Sounds like a protected branch with just "Allowed to merge" would be ideal.
But unfortunately, "Allowed to merge" really means "Allowed to merge via web UI". If a maintainer prefers the command line tools, or needs to resolve a merge conflict (since #25014 is not ready yet), then they cannot do so.
Instead, we have to leave "Allowed to push and merge" open, and add our own git hook to check that only merges are made. We unfortunately have a hard time enforcing that they are also associated with a merge request this way.
What we'd like is that the "Allowed to merge" setting allows command line pushing merge commits if (and only if) the parents of said merge commits are between the protected branch and open merge requests.