docs(#73): protect-main covers both branches (one ruleset, literal refs)#78
Merged
Conversation
Corrects Phase 1 wording that implied a separate develop ruleset. gitflow-lite Phase 2 uses ONE protect-main ruleset targeting refs/heads/main + refs/heads/develop via literal refs (not ~DEFAULT_BRANCH), so both branches are protected identically and protection cannot follow a future default-branch flip. Closes #73. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NxREWu8gax6BnxGcW3n4mH
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.
What
Corrects a wording inaccuracy left by gitflow-lite Phase 1 (PR #77): the CLAUDE.md branching guidance said "both `protect-main` and the `develop` ruleset require `app`+`e2e`", implying two rulesets.
Why
Phase 2 adopted the agent-panel's unanimous best-practice design (Approach A): the single existing `protect-main` ruleset (id 19043136) was repointed in place so `conditions.ref_name.include = ["refs/heads/main", "refs/heads/develop"]` — dropping `~DEFAULT_BRANCH`. There is one ruleset covering both branches via literal refs, which structurally eliminates the default-branch-follow foot-gun (a `~DEFAULT_BRANCH` ruleset would migrate onto `develop` on the flip and strand `main`).
Verified post-flip via `gh api repos/DocGerd/sail_command/rules/branches/{main,develop}`: both branches carry all four rules (deletion, non_fast_forward, pull_request w/ thread-resolution, required_status_checks strict app+e2e).
This PR is also the first change to land against the new `develop` default — it validates the develop protection + required-check gates end-to-end.
Closes #73.
🤖 Generated with Claude Code