Skip to content

Commit 651c2e7

Browse files
committed
docs(release): record conflict resolution
1 parent 6c86cf9 commit 651c2e7

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

docs/rxjs-next/PROJECT_PLAN.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3624,3 +3624,15 @@ conformance implementation depends on a runnable harness.
36243624
satisfy the audit.
36253625
- Kept P6.10 as the sole `NEXT` item; these local review fixes do not satisfy
36263626
the remaining administrator setup or disposable-package rehearsal gates.
3627+
3628+
### 2026-08-04 — P6.10 review-branch conflict resolution
3629+
3630+
- Rebased the Copilot follow-up onto the merged single-maintainer hardening and
3631+
dependency-advisory work, dropping the two release commits already present on
3632+
`master` instead of replaying or reverting them.
3633+
- Adapted runner validation to the split release-PR, qualification,
3634+
authorization, and staging workflows while preserving exact Ubuntu 24.04,
3635+
macOS 15, Node 24.12.0, OSV, property-test, and checked-toolchain controls.
3636+
- Passed all 53 release/security tests, 177 OSV exception validations, release
3637+
coherence and doctor checks, workflow formatting, and diff hygiene. P6.10
3638+
remains the sole `NEXT` item pending its external setup and rehearsal gates.

0 commit comments

Comments
 (0)