Repository navigation
fix(sync): serialize shared source updates - #207
Open
abretonc7s wants to merge 2 commits into
Open
abretonc7s wants to merge 2 commits into
abretonc7s wants to merge 2 commits into
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
This branch has not been deployed
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
Concurrent slot prepares failed with
fatal: Cannot rebase onto multiple brancheswhile updating one shared skill source. Serialize the existinggit pull --ff-onlyper checkout. Separate checkouts stay parallel, and failed updates still refuse stale installation.The full-catalog CI audit also required shortening an existing oversized TypeScript skill description. Its body and references are unchanged.
Type of change
Testing
eee4734b-357a-476e-a6a9-374ec61936d6and0e91148a-c813-4557-aa33-41b94e2ba4a6. Both returnedprepared=true, installed the expected revision and were cancelled. Hook concurrency 2; Git-pull concurrency 1. No worker dispatched.Preflight incident: before the private socket parent existed, an import sent two cosmetic tmux option writes to the existing shared server. No session lifecycle command ran. Prior option values were not captured; no restoration claim. Actual prepares used a corrected explicit private-socket fence, and owned cleanup passed.
F200. No selection, branch-reset or installer policy changes. Existing callers need the normal post-merge source/package rollout.