Skip to content

Merge hygiene: recommended land order for in-flight doc PRs #266

Description

@jflowers

Context

13 open PRs exist against the website repo, several editing the same files. This issue tracks the recommended merge order and conflict risks to prevent regressions.

Recommended land order

  1. docs: add review infrastructure and convention pack documentation #256 (opsx/review-infra-docs) — Sets canonical values:

    • Constitution v1.2.0 with Principle V (Security by Default)
    • _index.md: "4 core principles" → "5 core principles"
    • Persona count standardized: "9 = 6 review + 3 content"
    • Branch naming: NNN-*speckit/NNN-*
    • Documents /uf.address-feedback in CLI reference
  2. docs: migrate slash commands to uf.* namespace and document new capabilities #257 (opsx/slash-command-docs-update) — Namespace migration:

  3. docs: sync Dewey documentation to v3.2.0 #252 (opsx/dewey-docs-sync) — Dewey tool count: canonical 50

  4. Remaining PRs in any order, rebasing on the above.

Conflict risks

Risk PRs involved Resolution
common-workflows.md edited by 5 PRs #257, #256, #74, #251, #244 Land #256#257 first; rebase others
_index.md core-principle count #256 (sets 5), #257 (still says 4) #256 must win; #257 rebase or post-merge fix
Dewey tool count drift #252 sets 50; older PRs may reference 48/40 Verify no PR reintroduces stale count
#244 and #257 overlap on #162 finale content Both add structured PR descriptions Merge #257 first (more comprehensive); #244 may become redundant

Post-merge survivor fixes

After the above land, these correctness/positioning issues remain (tracked as separate issues):

  • Exit-point contradiction 6→5 (see related issue)
  • "Why a harness, not a plugin?" page (see related issue)
  • Testing-as-quality-judge differentiator (see related issue)
  • Homepage conversion pass (see related issue)

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions