Skip to content

Commit dc08c5e

Browse files
committed
PR_26172_OWNER_019 day work EOD merge governance
1 parent 1a3a6f9 commit dc08c5e

8 files changed

Lines changed: 109 additions & 351 deletions

docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ Existing Project Instructions remain preserved in their current locations. This
3333

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

36+
## Day Work / EOD Merge Rule
37+
38+
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
39+
40+
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
41+
"Merge this PR now."
42+
43+
Do not treat sequential PR completion as merge approval.
44+
3645
## OWNER Governance
3746

3847
OWNER override wording:

docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ Work only that assignment.
7070

7171
Ready-to-copy reminder:
7272

73+
Confirmed required rule:
74+
7375
```text
7476
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
7577

docs_build/dev/ProjectInstructions/addendums/multi_team.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Rules:
2828

2929
## Day Work / EOD Merge Rule
3030

31+
Confirmed required rule:
32+
3133
During active work:
3234
- Work happens on assigned team branches, OWNER branches, or scoped PR branches.
3335
- Commits are allowed only on assigned non-main branches.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# PR_26172_OWNER_019 Instruction Compliance Checklist
2+
3+
- [x] Read `docs_build/dev/PROJECT_INSTRUCTIONS.md`.
4+
- [x] Read `docs_build/dev/PROJECT_MULTI_PC.txt`.
5+
- [x] Read `docs_build/dev/ProjectInstructions/README.txt`.
6+
- [x] OWNER override documented by user.
7+
- [x] Started from PR018 branch.
8+
- [x] Created branch `pr/26172-OWNER-019-day-work-eod-merge-governance`.
9+
- [x] Added or confirmed Day Work / EOD Merge rule.
10+
- [x] Did not delete ProjectInstructions content.
11+
- [x] Did not commit directly to `main`.
12+
- [x] Did not merge any PR.
13+
- [x] Ran docs/static validation.
14+
- [x] Created repo-structured delta ZIP.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# PR_26172_OWNER_019 Manual Validation Notes
2+
3+
- Verified the required commit/push rule appears in ProjectInstructions.
4+
- Verified the required EOD merge rule appears in ProjectInstructions.
5+
- Verified `multi_team.md` confirms the required rule.
6+
- Verified `TEAM_START_COMMANDS.md` confirms the required rule.
7+
- Verified no runtime, UI, Playwright, or sample files changed.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# PR_26172_OWNER_019-day-work-eod-merge-governance
2+
3+
## Scope
4+
5+
Add and confirm Day Work / EOD Merge governance in the installed ProjectInstructions operating system.
6+
7+
## Changes
8+
9+
- Added the required Day Work / EOD Merge rule to `PROJECT_INSTRUCTIONS.md`.
10+
- Confirmed the required rule in `addendums/multi_team.md`.
11+
- Confirmed the required rule in `TEAM_START_COMMANDS.md`.
12+
13+
## Required Rule
14+
15+
Commit/push during the day is allowed only on assigned team/OWNER/PR branches.
16+
17+
Merge to main is EOD-only and owner-approved, unless the owner explicitly says:
18+
"Merge this PR now."
19+
20+
## Validation
21+
22+
- `git diff --check`
23+
- `git diff --cached --check`
24+
- Text search for required Day Work / EOD Merge wording
25+
26+
## Skipped Lanes
27+
28+
- Playwright skipped: documentation-only governance.
29+
- Samples skipped: documentation-only governance.
30+
31+
## Package
32+
33+
- `tmp/PR_26172_OWNER_019-day-work-eod-merge-governance_delta.zip`
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1+
docs_build/dev/ProjectInstructions/PROJECT_INSTRUCTIONS.md
12
docs_build/dev/ProjectInstructions/TEAM_START_COMMANDS.md
2-
docs_build/dev/ProjectInstructions/addendums/build_path_sync.md
3-
docs_build/dev/ProjectInstructions/addendums/deprecation.md
4-
docs_build/dev/ProjectInstructions/addendums/team_release_readiness.md
5-
docs_build/dev/ProjectInstructions/addendums/tile_overlay_status.md
6-
docs_build/dev/ProjectInstructions/backlog/BACKLOG_MASTER.md
7-
docs_build/dev/ProjectInstructions/team_assignments/TEAM_ASSIGNMENTS.md
8-
docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization-instruction-compliance-checklist.md
9-
docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization-manual-validation-notes.md
10-
docs_build/dev/reports/PR_26172_OWNER_018-nato-team-normalization.md
3+
docs_build/dev/ProjectInstructions/addendums/multi_team.md
4+
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-instruction-compliance-checklist.md
5+
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance-manual-validation-notes.md
6+
docs_build/dev/reports/PR_26172_OWNER_019-day-work-eod-merge-governance.md
117
docs_build/dev/reports/codex_changed_files.txt
128
docs_build/dev/reports/codex_review.diff

0 commit comments

Comments
 (0)