Skip to content

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

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

adrianwebb merged 6 commits into
stagingfrom
codex/cleanup-integrated-history-118

Conversation

@adrianwebb

Copy link
Copy Markdown
Contributor

Refs #118; 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 3999d741d64916227a07523343b8c508cdeb1b6d; candidate 45956685a7ca5c610c5ef43c43096400455aa0f1; EXACT unchanged Git tree 0afcc3ccf2bcbc3fd61c437cdc99951a149500be. 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 4797f18 into staging Oct 5, 2026
1 check passed
@adrianwebb
adrianwebb deleted the codex/cleanup-integrated-history-118 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