Skip to content

Document develop ruleset omitting branch-up-to-date check#143

Merged
ptr727 merged 1 commit into
developfrom
docs-develop-strict-flag-off
May 13, 2026
Merged

Document develop ruleset omitting branch-up-to-date check#143
ptr727 merged 1 commit into
developfrom
docs-develop-strict-flag-off

Conversation

@ptr727
Copy link
Copy Markdown
Owner

@ptr727 ptr727 commented May 13, 2026

Summary

  • Updates the AGENTS.md "Branching Model" section to reflect that the develop ruleset's strict_required_status_checks_policy was flipped from true to false server-side today (rule id 12277308).
  • Replaces the bullet that said develop keeps the up-to-date check on, only main omits it with a two-part bullet covering both rulesets and their distinct reasons (main: graph-reachability after every merge release; develop: bot auto-merge race-proofing).
  • Adds a do-not-reintroduce warning and threads the relaxed-flag rationale through the parallel-bots bullet so a future template sync can't quietly put the flag back.

Why

PR #141 sat OPEN with all checks green and auto-merge armed because a sibling Dependabot PR (#140) against develop merged ~10 seconds after #141 opened, pushing #141 into mergeStateStatus: BEHIND. Auto-merge cannot fire while the strict flag is on, and nothing in the merge-bot (see merge-bot-pull-request.yml) auto-updates a bot branch in that window. The matching main-side PR (#142) merged cleanly because main's ruleset already had strict off — that asymmetry is the smoking gun.

Upstream template

The yesterday-synced ProjectTemplate ruleset has the same strict_required_status_checks_policy: true on develop. Filed ptr727/ProjectTemplate#82 so the template gets the matching change and downstream consumers don't reintroduce the flag on their next sync.

Scope

Docs only. The actual ruleset flip was applied server-side and is already verifiable via gh api repos/ptr727/LanguageTags/rules/branches/developstrict_required_status_checks_policy: false. PR #141 itself was unblocked separately (gh api -X PUT .../pulls/141/update-branch, re-arm auto-merge, merged at 14:45:33Z).

Test plan

  • Copilot review on the current head — no factual / phrasing pushback.
  • Check pull request workflow status green.
  • Next pair of same-day Dependabot PRs against develop both auto-merge without anyone touching gh pr update-branch. (Will surface organically on the next daily run.)

The develop branch ruleset's `strict_required_status_checks_policy`
was flipped from `true` to `false` server-side today, matching main.
This unblocks bot auto-merge when two PRs against develop land within
the same minute and the first pushes the second into BEHIND state.
Observed in #141 (nuget-deps → develop sat OPEN with all checks green
because PR #140 had merged into develop ~10 s after #141 opened).

Update the Branching Model bullet that previously stated develop kept
the "up to date" check on; now both rulesets omit it for two distinct
reasons:

- Main: graph-based reachability fails after every develop → main
  merge release because forward-only develop never re-acquires main's
  new tip commit.
- Develop: bot auto-merge incompatibility. The merge-bot enables
  auto-merge once on opened/reopened and never auto-updates the head
  ref, so a sibling-merge race leaves the second PR permanently BEHIND
  while auto-merge waits for a strict policy that nothing satisfies.

Also add a do-not-reintroduce warning and cross-reference the relaxed
flag from the parallel-bots bullet so a future template sync doesn't
silently put the flag back.

The matching change in the upstream template is tracked at
ptr727/ProjectTemplate#82.
Copilot AI review requested due to automatic review settings May 13, 2026 14:54
@ptr727 ptr727 enabled auto-merge (squash) May 13, 2026 14:55
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the repository’s canonical contributor/agent documentation to reflect that the develop branch ruleset no longer requires PR branches to be “up to date before merging” (matching the already-relaxed main ruleset), and documents the distinct rationale for each branch.

Changes:

  • Document that both main and develop rulesets have strict_required_status_checks_policy: false, with separate explanations for why each omits the “up to date” requirement.
  • Add an explicit warning not to reintroduce the strict flag on develop due to bot auto-merge race conditions.
  • Thread the “strict off” rationale into the parallel-bots section so future template syncs don’t silently revert the intent.

@ptr727 ptr727 merged commit 0f69a1b into develop May 13, 2026
13 checks passed
ptr727 added a commit that referenced this pull request May 13, 2026
Release: document develop ruleset strict-flag removal (#143)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants