Recover incubator research history - #12
Merged
Merged
Conversation
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
2 participants
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.
Summary
codex/incubator-local-cleanup/ PR Codex/incubator local cleanup #5 as reachable repository historymainfile tree as the controlling content stateHISTORY_RECOVERY_LOG.mdexplaining the recovery boundaryWhy
PR #5 contains the research/incubator history that made the repo look inactive when it stayed detached from
main. A normal content merge is unsafe because the branch contains large path drift, deletions, and raw historical material. This PR bridges the ancestry first so the research history is no longer detached.Important merge instruction
Use a normal merge commit. Do not squash or rebase this PR, because squashing would discard the recovered ancestry and defeat the purpose of this history bridge.
Checks
git diff --checkmaintree before adding the recovery log