Plan14 owned conflict recovery source fixture - do not merge #10
Loading…
Reference in a new issue
No description provided.
Delete branch "codex/plan14-conflict-acceptance-20261006"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
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.
The distinct source commit identifies the owned resolve_conflicts fixture. Durable native snapshot/Git/PR publication must preserve this source PR and its ordinary work-item marker.
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.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.