Skip to content

feat: add back-merge skill - #15

Closed
cs-raj wants to merge 2 commits into
mainfrom
feat/add-back-merge-skill
Closed

cs-raj wants to merge 2 commits into
mainfrom
feat/add-back-merge-skill

Conversation

@cs-raj

@cs-raj cs-raj commented Aug 16, 2026

Copy link
Copy Markdown

Summary

  • Adds the back-merge skill for checking and creating back-merge PRs (main/master → development) across repos after a release
  • Fully generic — no hardcoded org IDs, Jira domains, or project keys

What the skill does

Two input modes:

  • fixVersion — queries Jira for all repos touched in a release (project key extracted automatically from the fixVersion string)
  • Repo list — paste GitHub URLs directly
  • Both — combine both sources

Two run modes:

  • check — read-only audit showing what needs back-merging (default)
  • create — raises PRs for all repos that need them (confirmation required)

How to use

/back-merge "PROJ | 16-08-2026 | Release" check
/back-merge https://github.com/org/repo1 https://github.com/org/repo2
/back-merge "PROJ | 16-08-2026 | Release" create

How to install

npx skills add git@github.com:contentstack/contentstack-agent-skills.git --skill back-merge

Requirements

Tool Install Auth
gh CLI brew install gh gh auth login
Jira MCP configured in Claude Code — (fixVersion mode only)

🤖 Generated with Claude Code

cs-raj and others added 2 commits August 16, 2026 15:43
Adds the resolve-snyk skill for end-to-end Snyk vulnerability resolution
on any GitHub npm repo. Covers full audit (npm audit + snyk test + snyk
code), safe dep upgrades, transitive overrides, single clean install,
build verification, and PR creation — all with explicit approval gates.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Adds the back-merge skill for checking and creating back-merge PRs
(main/master → development) across repos after a release. Supports
fixVersion mode (pulls repos from Jira) and direct repo list mode.
Fully generic — no hardcoded org IDs or Jira domains.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@cs-raj
cs-raj requested a review from a team August 16, 2026 10:25
@github-actions

Copy link
Copy Markdown

🔒 Security Scan Results

ℹ️ Note: Only vulnerabilities with available fixes (upgrades or patches) are counted toward thresholds.

Check Type Count (with fixes) Without fixes Threshold Result
🔴 Critical Severity 0 0 10 ✅ Passed
🟠 High Severity 0 0 25 ✅ Passed
🟡 Medium Severity 0 0 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

✅ No SLA breaches detected. All vulnerabilities are within acceptable time thresholds.

Severity Breaches (with fixes) Breaches (no fixes) SLA Threshold (with/no fixes) Status
🔴 Critical 0 0 15 / 30 days ✅ Passed
🟠 High 0 0 30 / 120 days ✅ Passed
🟡 Medium 0 0 90 / 365 days ✅ Passed
🔵 Low 0 0 180 / 365 days ✅ Passed

✅ BUILD PASSED - All security checks passed

@timbenniks-contentstack

Copy link
Copy Markdown
Contributor

Thanks @cs-raj for putting this together! We're not including it in this bundle, though. This repo is the public set of Contentstack product skills for customers (CMS, SDKs, Live Preview, Launch, Studio…), and this skill automates our internal engineering workflow (post-release back-merges based on our Jira fix versions and branch layout). It would be a great fit for an internal engineering skills repo. Happy to help set one up. We're shipping the current bundle as one release in #21, so I'm closing this here.

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.

3 participants