Source: V1R4C5 tag based on unique publication commit a32c76a
- docs/releases/V1R4C5-acceptance-evidence.md (from V1R4C5 tag)
- docs/releases/V1R4C5-final-owner-approval.md (from V1R4C5 tag)
Constraints honored:
- Not writing directly to main
- No V1R4C6 content introduced
- Memory search remains disabled per owner approval
Generated merge candidate branch: reconcile/v1r4c5-release-to-main-20260711
1.7 KiB
1.7 KiB
V1R4C5 Release to Main Reconcile Plan
Date: 2026-07-11
Status: reconcile preparation
Objective
Bring the V1R4C5 release state back into main without rewriting history and without moving the immutable V1R4C5 tag.
Source of Truth
Release baseline:
V1R4C5
Promotion commit:
a32c76a3c1baa49562e53fb8adce10a5ed0e6704
Tag:
V1R4C5
Tag policy:
immutable
Reconcile Rules
Allowed:
- normal merge commits;
- fast-forward where possible;
- conflict resolution with review;
- updating main to contain released C5 state.
Forbidden:
- force-push;
- tag movement;
- rewriting release history;
- importing V1R4C6 feature code into this reconcile.
Expected Included C5 Content
- SR-01 Gitea reliability guardrails.
- Gitea branch consistency sentinel.
- SR-02 watcher state cleanup.
- User Data Isolation gate.
- Reliability governance documents.
- Admin Workbench read-only preparation records.
Expected Excluded Content
Do not include:
- V1R4C6 Admin Workbench implementation code.
- SR-03 Search Gateway implementation.
- Agent Platform integration.
- Memory search activation.
- Global vector index.
Validation Before Main Merge
Required:
getBaseline.current_baseline == V1R4C5
V1R4C5 tag unchanged
memory search disabled
Gitea sentinel healthy
SR-02 tests pass
main merge does not include V1R4C6 branches
Post Merge Validation
Run:
getRuntimeStatus
getBaseline
createBranch
createPatch
Expected:
main contains V1R4C5 release state
active baseline remains V1R4C5
Owner Gate
Normal merge to main may proceed after validation.
No tag creation or baseline promotion is required because V1R4C5 is already promoted.