Repository navigation
Reconcile main ancestry into staging without changing files - #22
Closed
adrianwebb wants to merge 1 commit into
Closed
adrianwebb wants to merge 1 commit into
adrianwebb wants to merge 1 commit into
Conversation
7 of 9 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refs treeseed-ai/platform#462.
Outcome
Merge main history back into staging; this is not production promotion. Exact merge-tree result is identical to staging:
2f2d9ddb12f318deb2498c39516f4a3286b6dcce. No application, dependency, release, or configuration changes.Exact inputs
8f9458e7e525d64f36236789688af83250f808744cafd5be19184509fb9f3fb8f1971f8849253927Verification
Git merge-tree succeeds without conflicts and git diff staging is empty. Required Actions remain enforced. Use a merge commit (not squash/rebase) to preserve main ancestry. Do not delete main after merge.
Rollback
No file changes to roll back. Preserve both protected histories; never force-reset. No release dispatched.
Superseded by #23: reconciliation branch carries both protected parents and satisfies strict current-base checks without modifying main.