Skip to content

Preserve integrated feature commit lineage; staging tree unchanged - #31

Merged
adrianwebb merged 2 commits into
stagingfrom
codex/cleanup-integrated-history-30
Oct 5, 2026
Merged

adrianwebb merged 2 commits into
stagingfrom
codex/cleanup-integrated-history-30

Conversation

@adrianwebb

Copy link
Copy Markdown
Contributor

Refs #30; central treeseed-ai/platform#626.

User-requested cleanup preserving original commits and full lineage. Native git cherry on each exact listed feature head (Issue body) found zero new patches; all have integrated equivalents in protected staging. This Git ours history-only merge records those original commits as ancestors without reapplying outdated branch trees.

Initial staging 452bf0945520dcd0db9ac3f39fb16626b1047fe6; candidate d48f85c80ddde5184eb8c65ac5f0810c566a9ea6; EXACT unchanged Git tree 38873537c72c72359c537c6123bd28c7e86ef6a0. Every retained feature head verified ancestor of candidate. No source, tests, config, workflow, dependencies, policies, release tags, runtime or activation changes. Fresh required Actions must pass before protected staging merge. Then redundant refs can be removed recoverably from protected history, followed by verified staging-to-main promotion.

@adrianwebb
adrianwebb merged commit c476ce5 into staging Oct 5, 2026
1 check passed
@adrianwebb
adrianwebb deleted the codex/cleanup-integrated-history-30 branch October 5, 2026 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant