PR_26179_OWNER_011-team-stacked-pr-policy#256
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 154f027bf1
ℹ️ 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".
|
|
||
| OWNER PRs may start from synchronized `main` when marked Independent and no direct dependency exists. | ||
|
|
||
| A non-Owner team PR may start from `main` only when OWNER explicitly marks the PR as `standalone/no-dependency`. Otherwise, non-Owner team PRs use Stacked PR workstreams by default and must start from the active team workstream branch or documented previous PR branch. |
There was a problem hiding this comment.
For a non-Owner team starting the first PR in a new stacked workstream, this file's Team Branch Creation Gate still requires the initial branch to be created only after the main checks pass, but this new rule makes any non-Owner start from main require standalone/no-dependency and otherwise requires an active workstream or previous PR branch. In that first-stack scenario neither a previous branch nor an active workstream branch exists yet, so valid new non-Owner stacks will hard-stop unless they are incorrectly reclassified as standalone; carve out the first PR in a new stacked workstream from this prohibition.
Useful? React with 👍 / 👎.
| Rules: | ||
| - Stacked PRs may start from the previous PR branch when there is a direct dependency. | ||
| - Non-Owner team PRs should use Stacked PR workstreams by default. | ||
| - A Stacked PR belongs under the active team workstream and must use the documented previous PR branch or active workstream branch as its starting point. |
There was a problem hiding this comment.
When a stacked PR is meant to continue from an active team workstream branch that is not itself the documented previous PR branch, this new alternative is immediately contradicted by the existing hard-stop rule below that only permits the documented previous PR branch. As written, Codex will still hard-stop for the active-workstream branch path introduced here; update the mismatch rule to accept the documented active workstream branch as well.
Useful? React with 👍 / 👎.
ToolboxAid
changed the base branch from
PR_26179_OWNER_011-pr-branching-model-docs
to
main
1 participant
PR_26179_OWNER_011-team-stacked-pr-policy Report
Purpose
Update active Project Instructions so OWNER may create independent PRs from
main, while non-Owner teams use stacked PR workstreams by default.Branching Model
PR_26179_OWNER_011-pr-branching-model-docs/ PR PR_26179_OWNER_011-pr-branching-model-docs #255PR_26179_OWNER_011-pr-branching-model-docsGovernance Outcome
mainwhen independent and no direct dependency exists.mainonly when OWNER explicitly marks the PR asstandalone/no-dependency.Updated Documents
dev/build/ProjectInstructions/addendums/pr_workflow.mddev/build/ProjectInstructions/addendums/project_instructions_single_source_eod_lock.mddev/build/ProjectInstructions/addendums/branch_lock_governance.mddev/build/ProjectInstructions/addendums/branch_context_governance.mddev/build/ProjectInstructions/standards/CODEX_WORKFLOW_COMMANDS.mddev/build/ProjectInstructions/TEAM_START_COMMANDS.mddev/build/ProjectInstructions/addendums/codex_artifact_and_reporting_standard.mdRuntime Impact
None. This PR changes documentation/governance only.
ZIP
dev/workspace/zips/PR_26179_OWNER_011-team-stacked-pr-policy_delta.zip