Skip to content

fix: skills now properly reference origin/canary and create changeset #2930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorgemoya merged 1 commit into from
Mar 17, 2026
Merged

fix: skills now properly reference origin/canary and create changeset #2930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .claude/skills/release-catalyst/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Invoke the `/sync-makeswift` skill, with one addition: during the sync (after me

**Determine bump type**: Match the bump type from Stage 1 (e.g., if core went `1.4.2` → `1.5.0`, that's a `minor`).

**Create changeset file** (`.changeset/sync-canary-<version>.md`):
**Create changeset file** (`.changeset/sync-canary-<version>.md`, where `<version>` uses hyphens instead of dots — e.g., `1.6.0` → `sync-canary-1-6-0.md`). Changeset filenames only allow lowercase letters and hyphens; dots are invalid.

```markdown
---
Expand Down
3 changes: 2 additions & 1 deletion .claude/skills/sync-makeswift/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Execute the following phases in order. Pause for user input where indicated.
```bash
git fetch origin
git checkout -B sync-integrations-makeswift origin/integrations/makeswift
git merge canary
git merge origin/canary
```

If the merge completes cleanly, skip to changeset cleanup. Otherwise, resolve conflicts.
Expand Down Expand Up @@ -78,5 +78,6 @@ Switch back to `canary` and delete the local branches that are no longer needed:

```bash
git checkout canary
git pull
git branch -D sync-integrations-makeswift integrations/makeswift
```
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ coverage/
.history
.unlighthouse
.bigcommerce
.mcp.json
Loading