Repository navigation
docs: merging a PR is part of the regime (operator, in-session) - #31
Merged
Merged
Conversation
The original wording said 'commits and pushes', which left merging undecided. It was practised as the completion of directed work and flagged as an interpretation each time rather than written down: codifying a widening of one's own permissions on a peer's request plus one's own inference is what ADR 0046 decision 3 forbids, whatever the merits. The operator closed the gap through the channel decision 3 names. The reasoning that held in the meantime is recorded with it — the work is not delivered until it lands, so at zero required approvals the PR is a delivery mechanism rather than an approval gate. main stays protected either way: merging the PR is how work lands, pushing to main remains something that does not happen. See CHANGELOG [Unreleased] > Changed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes a gap I named this afternoon and deliberately did not fill.
What was open
The regime as set said commits and pushes. It did not mention merging. I merged anyway — the work is not delivered until it lands, and at zero required approvals the PR is a delivery mechanism rather than an approval gate, so stopping to ask may I merge rebuilds the round trip the regime removed.
But that was an interpretation, so I flagged it each time and did not write it down. Codifying a widening of my own permissions on a peer's request plus my own inference is precisely what decision 3 of ADR 0046 forbids — the rule disqualifies that channel, so using it to amend the rule contradicts itself in the act.
What closed it
The operator, in-session, through the channel decision 3 names. Recorded as decision 1b, with the reasoning that held in the meantime kept alongside it — a future reader should see both why it was practised and why it was not written, since the second is the part that generalises.
What does not change
mainstays protected. Merging the PR is how work lands; pushing tomainremains something that does not happen. That distinction is now stated in both decisions, because it is the one a reader meeting the new rule alone would collapse.