admin/0pt
5
0
Fork 0
Code Issues 9 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix(estate): reconnect main history after orphan docs(production) commit #551

Merged
admin merged 1 commits from fix/reconnect-main-history into main 2026-11-10 15:28:46 +00:00
Conversation 0 Commits 1 Files Changed -
admin commented 2026-11-10 15:21:01 +00:00
Owner
Copy Link
Copy Source

Incident: the docs(production) publishing sweep (2026-11-10) pushed main as a parentless commit; 1230 commits of history were no longer ancestors of main.

Fix: one merge commit whose tree is byte-identical to current main (20911a399f3a) with the last pre-orphan tip 2a253bdb6630 (from a local clone reflog) as second parent. No content change, no force-push.

Merge with the merge style (not rebase/squash: a rebase would replay the whole history).

Files that differ between the pre-orphan tip and today (not changed by this PR, listed for review):

  • deleted since pre-orphan tip:
  • non-doc files changed since:

🤖 Generated with Claude Code

**Incident:** the docs(production) publishing sweep (2026-11-10) pushed `main` as a parentless commit; 1230 commits of history were no longer ancestors of `main`. **Fix:** one merge commit whose tree is byte-identical to current `main` (`20911a399f3a`) with the last pre-orphan tip `2a253bdb6630` (from a local clone reflog) as second parent. No content change, no force-push. **Merge with the merge style** (not rebase/squash: a rebase would replay the whole history). Files that differ between the pre-orphan tip and today (not changed by this PR, listed for review): - deleted since pre-orphan tip: - non-doc files changed since: 🤖 Generated with [Claude Code](https://claude.com/claude-code)
admin added 1 commit 2026-11-10 15:21:01 +00:00
fix(estate): reconnect main history after orphan docs(production) commit
CI (SIAX Cloud) / sonar (pull_request) Skipped
Details
masterplan-lock / check (push) Successful in 5s
Details
masterplan-lock / check (pull_request) Successful in 5s
Details
CI (SIAX Cloud) / Component conformance (blocking) (pull_request) Successful in 10s
Details
Security Scan (SIAX Cloud) / security (pull_request) Successful in 17s
Details
CI (SIAX Cloud) / integration (pull_request) Successful in 48s
Details
CI (SIAX Cloud) / security (pull_request) Successful in 1m27s
Details
CI (SIAX Cloud) / quality (pull_request) Successful in 12m9s
Details
ffa9ca68eb 
The docs(production) publishing sweep (2026-11-10) pushed main as a parentless commit, detaching 1230 commits of history. This merge keeps the current tree byte-for-byte and adds the last pre-orphan tip 2a253bdb66 (from the origin/main reflog of a local clone) as a second parent, so the history is an ancestor of main again without a force-push.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
admin merged commit 8be19c4b56 into main 2026-11-10 15:28:46 +00:00
admin deleted branch fix/reconnect-main-history 2026-11-10 15:28:47 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
siax-approver siax-bot siax-ci siax-healer (siax-healer (CI self-healing agent)) admin (Simon Axelsson)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: admin/0pt#551