jasonwarrenuk/Merge: Rebase & Squash from Branch
skills/git-branch-squash/SKILL.md
{{ 𝛀𝛀𝛀 }} Squash and rebase onto a branch (default main)
$ install --global
skillsauthnpx skillsauth add jasonwarrenuk/goblin-mode Merge: Rebase & Squash from BranchInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Jul 7, 2026, 7:56 AM198.1s1 file scanned
SKILL.md
- name:
- Merge: Rebase & Squash from Branch
- description:
- {{ 𝛀𝛀𝛀 }} Squash and rebase onto a branch (default main)
- model:
- opus
- disable-model-invocation:
- true
- allowed-tools:
- ["Bash(git:*)", "Read", "Glob", "Grep", "Edit"]
- argument-hint:
- ["target branch (default main)"]
Squash and Rebase onto Target
$ARGUMENTS (optional) — the branch to rebase onto. Defaults to main when omitted.
- Resolve
$BRANCH: use$ARGUMENTSif provided, otherwisemain - Check current branch name and confirm with user
- Do NOT create a worktree - work in the current directory
- Run
git fetch origin $BRANCH - Run
git rebase -i origin/$BRANCH— in the editor, squash or fixup commits as appropriate, leaving one clean commit (or a small number of logical commits) with a descriptive message - If conflicts exist, list them and resolve one at a time preserving our branch's intent, running
git rebase --continueafter each - Run tests to verify
- Push with
git push --force-with-lease
Related Skills
jasonwarrenuk/Roadmap: Build Zip
tools
VerifiedTrustedCommunity
{{ 𝚫𝚫𝚫 }} Rebuild roadmap-system.zip, the distributable snapshot of the roadmap tooling (scripts, HTML template, conventions reference, and every roadmap-touching skill, including this one).
5SKILL.mdUpdated Jul 21, 2026
jasonwarrenuk/skills/task-suggest
tools
VerifiedTrustedCommunity
--- name: "Suggest: Task" description: "{{ 𝚫𝚫𝚫 }} Suggest the next logical task — grounded in the roadmap's pre-vetted ready-set when one exists, codebase analysis otherwise" when_to_use: "When you don't know what to work on next and want a grounded recommendation rather than picking arbitrarily." model: haiku effort: low disable-model-invocation: true allowed-tools: ["Read", "Glob", "Grep", "Bash(python3:*)", "Bash(npm:*)", "Bash(bun:*)", "Bash(pnpm:*)", "Bash(deno:*)"] argument-hint: [named
5SKILL.mdUpdated Jul 17, 2026
jasonwarrenuk/Roadmap: Migrate
development
VerifiedTrustedCommunity
{{ 𝛀𝛀𝛀 }} Convert an old simple-style roadmap (single Markdown, four statuses, <a name> anchors, roadmaps.json pointer registry) into the rich phase-array format (roadmaps.json source of truth + PHASE task list + prose overview).
5SKILL.mdUpdated Jul 17, 2026
jasonwarrenuk/PR: Create
data-ai
VerifiedTrustedCommunity
{{ ƔƔƔ }} Create a pull request to main — wordy or shiny (with screenshots), ready-for-review or draft
5SKILL.mdUpdated Jul 17, 2026