claude-code
4c21614325
werkator build succeeded after 00:24
Co-authored-by: claude-code <claude-code@javagil.de>
41 lines
1.6 KiB
Markdown
41 lines
1.6 KiB
Markdown
# PR#19: the administrator of git.javagil.de keeps the merge override
|
|
|
|
> **WARNING:** This document describes only the change applied in this PR.
|
|
> It may already be outdated once the next PR is merged.
|
|
> Historic PR documentation is not maintained along with new PRs; treat it as a snapshot.
|
|
|
|
## The Problem
|
|
|
|
On 2026-10-06, `mi` merged Werkator PR#127 by habit, without the approval that the gate asks for.
|
|
As administrator, `mi` may merge past the branch protection, because `block_admin_merge_override` is not set.
|
|
The ops doc does not say whether this is intended.
|
|
|
|
## Non-Goals
|
|
|
|
- No change of the branch protection.
|
|
|
|
## The Scenarios
|
|
|
|
### Feature: the ops doc states the decision on the merge override
|
|
|
|
#### Scenario#19.01: a reader learns why the administrator can still merge past the gate
|
|
|
|
So that nobody switches the override off by mistake, or wonders why it is on.
|
|
|
|
- **Given** a reader of the ops doc for git.javagil.de
|
|
- **When** the reader looks up the branch protection
|
|
- **Then** the doc says that `mi` keeps the override on purpose
|
|
- **and** the doc names the reason and the risk
|
|
|
|
##### Verified by
|
|
|
|
- no automated test: a documentation change, see [docs/betrieb-git.javagil.de.md](../betrieb-git.javagil.de.md)
|
|
|
|
## The Solution
|
|
|
|
The ops doc states that `block_admin_merge_override` stays off on git.javagil.de:
|
|
the override is the way out of a false RED, and a merge by habit is a known risk.
|
|
On dev.hostsharing.net the guide keeps recommending the option, because the administrator there is an operator.
|
|
|
|
This PR also tests the automerge of a GREEN PR: the bot approves and schedules the merge, and Gitea merges without a human.
|