fix: restore 106 files accidentally reverted by PR #1023 merge#1027
Merged
bradygaster merged 2 commits intomainfrom Apr 22, 2026
Merged
fix: restore 106 files accidentally reverted by PR #1023 merge#1027bradygaster merged 2 commits intomainfrom
bradygaster merged 2 commits intomainfrom
Conversation
PR #1023 merged insider into main, but insider was behind on docs changes that had already landed on main via dev (PRs #989, #953, #955, #956, #906). The merge resolution picked insider's older versions, reverting 25 docs files. This restores all affected files from dev: - David Pine's human-led productivity emphasis (PR #989) - Cross-links between related documentation (PR #956) - Compaction recovery, coordinator restraint, result persistence refs - Teams async adapter migration guide - State backends feature doc - Search/Sidebar component updates - Landing page content Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
PR #1023 (insider->main) picked insider's older file versions, reverting 68 source/test/workflow files to outdated versions and deleting 13 files that existed on main. This restores all files to their correct state from dev (which matched pre-merge main). Affected areas: - CLI commands (cast, start, loop, plugin, externalize, watch/*) - SDK (state-backend, scheduler, comms-teams, azure-devops) - Workflows (release, publish, promote, preview, sync-labels) - Tests (13 deleted test files restored, 15 reverted tests fixed) - Templates and config files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
tamirdresher
changed the title
IEvangelist
approved these changes
Apr 22, 2026
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
3 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.
Fix: Restore 106 files accidentally reverted by PR #1023 merge
PR #1023 (insider→main) picked insider's older file versions everywhere, causing a massive accidental revert:
All files restored from
dev(which matched pre-merge main state).Affected areas
Root cause
The insider branch was far behind main on changes that had already landed via dev→main merges. When we merged insider→main for the v0.9.4 release, git picked insider's versions, effectively reverting everything main had that insider didn't.
Verification
All files verified by comparing git hashes:
old-main == devconfirmed these were genuine reverts, not intentional changes.