Skip to content

fix(sync): serialize shared source updates - #207

Merged
abretonc7s merged 3 commits into
mainfrom
fix/serialize-skill-source-updates
Nov 4, 2026
Merged

abretonc7s merged 3 commits into
mainfrom
fix/serialize-skill-source-updates

Conversation

@abretonc7s

@abretonc7s abretonc7s commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Description

When several repos or worktrees run the skills sync at the same time, they all run git pull --ff-only on the same shared skills checkout. The pulls collide and sync can fail with fatal: 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

  • Bug fix

Testing

  • Three real-Git regression tests; unchanged main reproduces the exact error.
  • Two concurrent prepares on one machine: both succeeded and installed the expected revision, with 2 hooks running at once and 1 Git pull at a time.
  • 76/76 tests, changelog, Bash syntax and full-catalog audit pass.

Existing callers pick this up through the normal source and package rollout.

@abretonc7s
abretonc7s marked this pull request as ready for review October 29, 2026 09:56
@abretonc7s
abretonc7s enabled auto-merge (squash) November 2, 2026 09:42
@abretonc7s
abretonc7s merged commit 1374197 into main Nov 4, 2026
28 checks passed
@abretonc7s
abretonc7s deleted the fix/serialize-skill-source-updates branch November 4, 2026 13:01
@andrepimenta andrepimenta mentioned this pull request Nov 18, 2026
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants