Plan 14 owned recovery acceptance fixture (do not merge) #9

Open
toasterson wants to merge 1 commit from codex/plan14-acceptance-20261006 into main
Owner

Owned disposable fixture for Plan 14 native operator recovery acceptance. Its source branches from the parent before the accepted canary contract document, creates an add/add conflict on that path, and includes source-only vendor and ownership sentinels.

The clean_port test must check out current main without inheriting either sentinel while preserving this exact source under refs/anima/recovery-source. The resolve_conflicts test must check out this exact source and preserve current main under refs/anima/recovery-base. Both require real native bootstrap and executor receipts. This PR is retained as evidence and will be closed after acceptance; it must not be merged. No existing canary feature or main branch is changed.

<!-- anima-work-item:01a111e4-3c6d-7cd0-8b87-5889407f59da --> Owned disposable fixture for Plan 14 native operator recovery acceptance. Its source branches from the parent before the accepted canary contract document, creates an add/add conflict on that path, and includes source-only vendor and ownership sentinels. The clean_port test must check out current main without inheriting either sentinel while preserving this exact source under refs/anima/recovery-source. The resolve_conflicts test must check out this exact source and preserve current main under refs/anima/recovery-base. Both require real native bootstrap and executor receipts. This PR is retained as evidence and will be closed after acceptance; it must not be merged. No existing canary feature or main branch is changed.
This pull request has changes conflicting with the target branch.
  • docs/akh-session-platform-canary.md
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin codex/plan14-acceptance-20261006:codex/plan14-acceptance-20261006
git switch codex/plan14-acceptance-20261006

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff codex/plan14-acceptance-20261006
git switch codex/plan14-acceptance-20261006
git rebase main
git switch main
git merge --ff-only codex/plan14-acceptance-20261006
git switch codex/plan14-acceptance-20261006
git rebase main
git switch main
git merge --no-ff codex/plan14-acceptance-20261006
git switch main
git merge --squash codex/plan14-acceptance-20261006
git switch main
git merge --ff-only codex/plan14-acceptance-20261006
git switch main
git merge codex/plan14-acceptance-20261006
git push origin main
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
toasterson/anima-canary!9
No description provided.