Skip to content
This repository was archived by the owner on Oct 15, 2026. It is now read-only.

feat(agents): add merge-upstream skill for stable release sync - #40

Merged
detroitpro merged 2 commits into
mainfrom
chore/merge-upstream-skill
Sep 24, 2026
Merged

detroitpro merged 2 commits into
mainfrom
chore/merge-upstream-skill

Conversation

@detroitpro

Copy link
Copy Markdown
Owner

Summary

  • Adds a project merge-upstream skill that syncs only the latest stable upstream tag (vX.Y.Z), triages release commits/PRs one by one into a single fork plan issue, then cherry-picks takes.
  • Refuses tip-of-upstream/main, nightlies, and previews unless explicitly overridden; never pushes or opens GitHub work on upstream.
  • Updates FORK.md so the documented default path is the skill, with make sync called out as a blunt tip-of-main escape hatch.

Test plan

  • Confirm skill is discoverable under .agents/skills/merge-upstream (and via .claude/skills symlink)
  • Invoke /merge-upstream and confirm it resolves latest stable tag and stops when origin/main already includes it (currently v0.0.42)
  • Confirm no gh calls target pingdotgg/t3code

Made with Cursor

Triage and cherry-pick the latest upstream vX.Y.Z release into this fork
instead of blindly merging tip-of-main; update FORK.md accordingly.

Co-authored-by: Cursor <cursoragent@cursor.com>
@detroitpro
detroitpro enabled auto-merge (squash) September 24, 2026 18:28
Co-authored-by: Cursor <cursoragent@cursor.com>
@detroitpro
detroitpro merged commit 223b206 into main Sep 24, 2026
2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant