Skip to content

Update merge rules and clarify requirements in README - #14

Merged
ptr727 merged 2 commits into
developfrom
readme3
Jan 15, 2026
Merged

Update merge rules and clarify requirements in README#14
ptr727 merged 2 commits into
developfrom
readme3

Conversation

@ptr727

@ptr727 ptr727 commented Jan 15, 2026

Copy link
Copy Markdown
Owner

Clarify the requirements for merge rules in the README and ensure all general merge types are enabled for rulesets to be honored.

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
Copilot AI review requested due to automatic review settings January 15, 2026 20:56

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the GitHub Project Settings section in the README to clarify the requirements for merge rules in rulesets. It reorganizes the configuration documentation by removing the "Allow squash merging" setting from the General/Pull requests section and adding an important note explaining that all general merge types must be enabled for GitHub rulesets to honor merge rules.

Changes:

  • Removed "Allow squash merging" from the General pull request settings list
  • Added a note with a reference link explaining that all general merge types must be enabled for rulesets merge rules to be honored

Comment thread README.md Outdated
…irements

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 merged commit 6212de5 into develop Jan 15, 2026
18 checks passed
@ptr727
ptr727 deleted the readme3 branch January 15, 2026 23:44
ptr727 added a commit that referenced this pull request Jul 16, 2026
…324)

The "runner next" half of the #310 roadmap decision (docs + matrix
landed in #311). Scope per owner direction: **on-demand only,
owner-initiated** (onboarding, suspected drift, deliberate changes) - no
scheduled workflow, no App-token machinery; it runs under the local `gh`
auth.

## What it does

`python3 spec/audit.py [RepoName ...]` (default: all 21 cataloged repos)
executes the deterministic subset of `AUDIT.md` per repo, read-only:

- **Settings** vs `repo-config/settings.json` (+ computed
`has_discussions`/`default_branch`)
- **Rulesets** vs the model's payloads (normalized diff;
missing/stray/duplicate flagged; `operational` repos compare
`operational/develop.json`)
- **Secrets (names only)** vs `spec/secrets.json`: baseline +
per-mechanism required in the right stores, forbidden anywhere,
unclaimed flagged as stale
- **File presence** on the ground-truth branch per `spec/files.json`
(model-aware `develop` payload path)
- **Branch facts**: main/develop existence, registry `hasDevelop` vs
reality, and content divergence via **tree compare** - commit counts
mislead under merge-commit promotions, so only a `develop...main` diff
with changed files (main carries content develop lacks) reports

Findings are typed `DEFECT` / `LETTER` (file absent, intent unverified
per AUDIT.md section 7) / `DRIFT`; exit is non-zero on defect/letter.
`AUDIT.md` section 0 references the runner.

## Live-tested (read-only)

- **Financial-Modeling** - reports exactly its known standup state: the
#14 files (`WORKFLOW.md`, `version.json`, `repo-config/*`,
`dependabot.yml`) absent on `main` pending PR #15;
settings/rulesets/secrets clean (as applied).
- **ProjectTemplate / PlexCleaner / HomeAutomation-Config** - exercised
the release, docker-secrets, and operational paths. Genuine drift
surfaced (stale hub secrets incl. `NINJA_API_KEY`/`NUGET_API_KEY`;
HomeAutomation-Config missing the baseline App pair; PlexCleaner missing
the repo-config carry) - reported to the maintainer separately, not
acted on.

Refs #310 (the cold-start self-test matrix remains the roadmap's open
acceptance item).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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