Skip to content

PR_26179_OWNER_013-project-branching-policy-document#258

Merged
ToolboxAid merged 1 commit into
mainfrom
PR_26179_OWNER_013-project-branching-policy-document
Jun 28, 2026
Merged

PR_26179_OWNER_013-project-branching-policy-document#258
ToolboxAid merged 1 commit into
mainfrom
PR_26179_OWNER_013-project-branching-policy-document

Conversation

@ToolboxAid

Copy link
Copy Markdown
Owner

PR_26179_OWNER_013-project-branching-policy-document Report

Purpose

Separate branching policy from startup validation mechanics.

Branching Model

Governance Outcome

  • Added dev/build/ProjectInstructions/PROJECT_BRANCHING_POLICY.md.
  • Moved full Independent PR and Stacked PR policy ownership into the dedicated branching policy document.
  • Updated startup validation to verify the branching policy document was loaded instead of duplicating branch policy details.
  • Incremented Project Instructions version to 2026.06.28.002.
  • Updated PROJECT_INSTRUCTIONS_VERSION.md with change notes for the branching policy document and startup validation change.
  • Updated pr_workflow.md to point to the dedicated branching policy instead of duplicating full policy text.

Runtime Impact

None. This PR changes documentation/governance only.

ZIP

  • dev/workspace/zips/PR_26179_OWNER_013-project-branching-policy-document_delta.zip

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 141d713a10

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

- the requested Stacked PR does not start from the documented previous PR branch or active workstream branch
- the Stacked PR lacks dependency order documentation
- the current branch changes unexpectedly
- the requested branch model conflicts with OWNER instructions

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Hard-stop when branch model is missing

This catches conflicts with a requested branch model, but it does not cover the case where no Independent/Stacked model is declared. The same commit removes the previous pr_workflow.md hard stop for “the request does not say whether the PR is Independent or Stacked and the start branch is not clearly valid,” while this new file is now the SSoT for hard-stop rules; on an unclear BUILD/PLAN started from a feature branch, none of the listed conditions require Codex to stop before changing files.

Useful? React with 👍 / 👎.

Comment on lines +7 to +12
## Branching Model

- Model: Stacked PR
- Previous PR dependency: `PR_26179_OWNER_012-project-instructions-startup-validation` / PR #257
- Starting branch: `PR_26179_OWNER_012-project-instructions-startup-validation`
- Merge order: PR #255, then PR #256, then PR #257, then this PR

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Keep stacked reports compliant with the new policy

For this Stacked PR, the new PROJECT_BRANCHING_POLICY.md dependency section requires every Stacked PR report to name the stack order, previous/next dependency when known, starting branch, merge order, base branch, and source branch. This report only records the model, previous dependency, starting branch, and merge order, so the PR's own required report artifact is incomplete and cannot verify the base/source or stack position later.

Useful? React with 👍 / 👎.

Comment on lines +42 to +44
Canonical PR branching policy lives in:

### Ownership Defaults
`dev/build/ProjectInstructions/PROJECT_BRANCHING_POLICY.md`

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Update branch gates that still expect rules here

After this section is reduced to a pointer, the required branch lifecycle gate still says dependent Stacked PRs may start only when addendums/pr_workflow.md identifies the direct dependency and dependency order. For dependent stacks, following that gate now lands on this pointer instead of the actual dependency rules, making branch-start validation depend on an extra indirection that the gate does not name; update the lifecycle/branch-lock references to PROJECT_BRANCHING_POLICY.md at the same time.

Useful? React with 👍 / 👎.

@ToolboxAid ToolboxAid changed the base branch from PR_26179_OWNER_012-project-instructions-startup-validation to main June 28, 2026 15:59
@ToolboxAid ToolboxAid merged commit 004a2a6 into main Jun 28, 2026
1 check passed
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.

1 participant