Repository navigation
fix(sync): serialize shared source updates - #207
Merged
Merged
Conversation
abretonc7s
marked this pull request as ready for review
October 29, 2026 09:56
abretonc7s
enabled auto-merge (squash)
November 2, 2026 09:42
MajorLift
approved these changes
Nov 4, 2026
Merged
cursor Bot
pushed a commit
that referenced
this pull request
Nov 18, 2026
Folds the post-branch merges into the curated 0.4.0 changelog per review: #258/#262 (mm-harness 0.96.33) into the recipe entry, #260/#261 into the perps-review-pr entry, #264 rule pack and #231 CV lint checklist as new entries, drops the inaccurate analytics-move BREAKING entry, and links Co-authored-by: George Marshall <georgewrmarshall@users.noreply.github.com> #207 on the tsc-blindspots entry.
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
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.
Description
When several repos or worktrees run the skills sync at the same time, they all run
git pull --ff-onlyon the same shared skills checkout. The pulls collide and sync can fail withfatal: Cannot rebase onto multiple branches.This serializes that pull per checkout in
tools/sync. Different checkouts still run in parallel, and a failed update still refuses to install stale skills. No changes to skill selection, branch reset or installer policy.The full-catalog CI audit also required shortening one oversized TypeScript skill description. Its body and references are unchanged.
Type of change
Testing
Existing callers pick this up through the normal source and package rollout.