docs: mandate integration branch for every phase - #529
Merged
Conversation
Every phase must use integrate/phase-<x>: sprint PRs target it (never develop directly), phase-ending review runs only after all sprints in the phase merge into it, and only then does it merge into develop. Phase Q's sprints (Q.1-Q.3) all merged straight to develop despite the phase plan declaring branch: integrate/phase-q, because neither this skill nor git-workflows.md actually enforced routing sprint PRs through it. This closes that gap going forward.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
integrate/phase-<x>: sprint PRs target it, phase-ending review runs only after all sprints merge into it, and only then does it merge intodevelop.developdespitephase-Q-plan.mddeclaringbranch: integrate/phase-q— neithercodex-orchestration/SKILL.mdnordocs/git-workflows.mdactually enforced it.Changes
.claude/skills/codex-orchestration/SKILL.md: new "Integration Branch" section, updated Preconditions/Sprint Flow/Phase-End Review to reference it.docs/git-workflows.md: new "Phase Integration Rule" section, updated "Pull Request Rule" to route phase sprint work through the integrate branch.Docs-only change; no code/behavior in the codebase itself.
Test plan