feat(rulesets): disable linear history and configure gitflow merges#51
Merged
JacobPEvans-personal merged 3 commits intoJul 13, 2026
Merged
Conversation
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
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.
Summary
Disables the strict linear history requirement across the org, configures branch-specific allowed merge methods for gitflow repositories, and refactors ruleset targeting to use native GitHub custom properties.
Changes
required_linear_history = truerule globally.org_gitflow_baseruleset enforcing required signatures on bothmainanddevelopfor gitflow repos.mainbranch to only allowmergecommits viaconfig/rulesets-defaults.yml.pull_requestrule to gitflowdevelopbranch allowingmerge,squash, andrebasemethods.gitflow: truecustom organization property instead of hardcoded repository names.Test Plan
tofu validateandtofu fmtto ensure the syntax and logic is sound.