Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ Existing Project Instructions remain preserved in their current locations. This

No PR in this operating system is merged without explicit owner approval.

## Day Work / EOD Merge Rule

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

Do not treat sequential PR completion as merge approval.

## OWNER Governance

OWNER override wording:
Expand Down
2 changes: 2 additions & 0 deletions docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ Work only that assignment.

Ready-to-copy reminder:

Confirmed required rule:

```text
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Expand Down
2 changes: 2 additions & 0 deletions docs_build/dev/ProjectInstructions/addendums/multi_team.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Rules:

## Day Work / EOD Merge Rule

Confirmed required rule:

During active work:
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
- Commits are allowed only on assigned non-main branches.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# PR_26172_OWNER_019 Instruction Compliance Checklist

- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
- [x] Read `docs_build/dev/ProjectInstructions/README.txt`.
- [x] OWNER override documented by user.
- [x] Started from PR018 branch.
- [x] Created branch `pr/26172-OWNER-019-day-work-eod-merge-governance`.
- [x] Added or confirmed Day Work / EOD Merge rule.
- [x] Did not delete ProjectInstructions content.
- [x] Did not commit directly to `main`.
- [x] Did not merge any PR.
- [x] Ran docs/static validation.
- [x] Created repo-structured delta ZIP.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# PR_26172_OWNER_019 Manual Validation Notes

- Verified the required commit/push rule appears in ProjectInstructions.
- Verified the required EOD merge rule appears in ProjectInstructions.
- Verified `multi_team.md` confirms the required rule.
- Verified `TEAM_START_COMMANDS.md` confirms the required rule.
- Verified no runtime, UI, Playwright, or sample files changed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# PR_26172_OWNER_019-day-work-eod-merge-governance

## Scope

Add and confirm Day Work / EOD Merge governance in the installed ProjectInstructions operating system.

## Changes

- Added the required Day Work / EOD Merge rule to `PROJECT_INSTRUCTIONS.md`.
- Confirmed the required rule in `addendums/multi_team.md`.
- Confirmed the required rule in `TEAM_START_COMMANDS.md`.

## Required Rule

Commit/push during the day is allowed only on assigned team/OWNER/PR branches.

Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
"Merge this PR now."

## Validation

- `git diff --check`
- `git diff --cached --check`
- Text search for required Day Work / EOD Merge wording

## Skipped Lanes

- Playwright skipped: documentation-only governance.
- Samples skipped: documentation-only governance.

## Package

- `tmp/PR_26172_OWNER_019-day-work-eod-merge-governance_delta.zip`
14 changes: 5 additions & 9 deletions docs_build/dev/reports/codex_changed_files.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
docs_build/dev/ProjectInstructions/addendums/build_path_sync.md
docs_build/dev/ProjectInstructions/addendums/deprecation.md
docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md
docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md
docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization.md
docs_build/dev/ProjectInstructions/addendums/multi_team.md
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md
docs_build/dev/reports/codex_changed_files.txt
docs_build/dev/reports/codex_review.diff
Loading
Loading