consolidate-main-preserve-science-lfs-cpu-gpu-history

This commit is contained in:
Digital Drosophila Archive
2026-10-01 16:54:47 +08:00
215 changed files with 8289 additions and 25 deletions
@@ -0,0 +1,25 @@
{
"schema": "branch-consolidation-plan-v1",
"remote": "ssh://git@192.168.10.31:2222/qishizhe/digital-drosophila.git",
"target_branch": "main",
"archive_tag_prefix": "archive/2026-10-01/",
"authorization": "User explicitly selected main consolidation, archive tags before remote branch cleanup, and preservation of existing server worktrees.",
"branches": {
"codex/project-bootstrap": "3981628ff893132a8148668aa94726886dba57a3",
"codex/apl-pn-scope-audit": "d6843e675dec5ae38a06f2ba70d74836aea53ace",
"codex/terminal-scope-diagnostic": "3213aada793740961885ba525494e95f019be6f8",
"codex/lif-semantics-audit": "5008cd85ca11750f23ce7bc001e8e821763b7501",
"codex/lif-author-semantics-lab": "09187e4d4d67badf1b418c5f211258ca5d8fb328",
"codex/lfs-public-resources": "5b1d1b72d7683b5c3dcc1f78b408e1d9dd2832ac",
"codex/v100-conditioning-acceleration": "4436241976887d8cc10088b0d44bc7ed70978fe6"
},
"merge_parents": ["4436241976887d8cc10088b0d44bc7ed70978fe6", "5b1d1b72d7683b5c3dcc1f78b408e1d9dd2832ac"],
"allowed_existing_file_changes": [".gitattributes", ".gitignore", "README.md", "CURRENT.md", "docs/40-operations/branches-20261001.md"],
"new_paths": ["docs/30-reproducibility/main-restore.md", "tools/branch-consolidation/", "registry/branch-consolidation-20261001/"],
"expected_artifact_paths": 181,
"expected_lfs_pointer_paths": 171,
"preserve_existing_worktrees": true,
"delete_lfs_objects": false,
"scientific_execution": false,
"allow_history_rewrite": false
}