Repository navigation
Document the repository merge setting a ruleset cannot set - #9
Merged
Merged
Conversation
`allowed_merge_methods` only narrows what the repository already permits. The `allow_merge_commit` switch lives on the repository, not in any ruleset, so `make rulesets-apply` cannot reproduce it — which makes it the one part of the gate a fresh repo has to set by hand. This repository already has it enabled, so the note is forward-looking here. It was found the hard way in dotnet-template, where the first merge under this policy failed with "Merge commits are not allowed on this repository." despite the ruleset being correct.
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.
Ports a gap found in
dotnet-templateback into this template's ruleset docs.allowed_merge_methodsonly narrows what the repository already permits. Theallow_merge_commit/allow_squash_merge/allow_rebase_mergeswitches live onthe repository, are not part of any ruleset, and
make rulesets-applythereforecannot set them. Requiring merge commits in a repo that has them switched off fails
with:
That is exactly what happened on the first merge in
dotnet-template, with acorrect ruleset applied. This repository already has merge commits enabled — verified
via the API — so the note is forward-looking here, and says so rather than implying
action is needed.
Documentation only; no configuration changes.