api-haus/merge
skills/merge/SKILL.md
Merge current worktree branch into main, cleanup worktree
$ install --global
skillsauthnpx skillsauth add api-haus/my-claude-workflow mergeInstall 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: May 23, 2026, 3:13 AM79.3s1 file scanned
SKILL.md
- name:
- merge
- description:
- Merge current worktree branch into main, cleanup worktree
Workflow context: This is the final step after
/rebaseand manual verification. The full sequence is:/rebase→ manual verification →/merge
Merge the current worktree's branch into main and remove the worktree.
Prerequisites
Before running /merge, ensure:
- Branch has been rebased onto latest main (
/rebase) - User has manually verified the feature works as expected
- All changes are committed
Process
- Ensure all changes are committed (prompt user if uncommitted changes exist)
- Detect current branch and worktree path
- Extract the slug from branch name (e.g.,
feat/player-collision->player-collision) - Switch to main repo:
cd ${PROJECT_ROOT} - Merge the branch:
git merge <branch-name> --no-edit - Remove the worktree:
git worktree remove <worktree-path> - Delete the branch:
git branch -d <branch-name> - Do NOT push unless explicitly requested
Naming Convention
| Component | Format |
|-----------|--------|
| Worktree | .claude/worktrees/<slug> |
| Branch | <type>/<slug> |
The slug is extracted from the branch name after the prefix.
Edge Cases
- If currently on main, ask user which branch to merge
- If uncommitted changes exist, prompt before proceeding
Related Skills
api-haus/research
data-ai
VerifiedTrustedCommunity
Extract research content from YouTube presentations, PDFs, or PPTX files into structured markdown. Dispatches each pass to a dedicated sub-agent (research-extractor / research-vision / research-refiner) so per-deck vision passes scale to hundreds of slides without bloating the parent context.
1SKILL.mdUpdated May 22, 2026
api-haus/profile
development
VerifiedTrustedCommunity
Build, run, and analyze Unity profiler data with perf-report-style call-stack attribution
1SKILL.mdUpdated May 22, 2026
api-haus/handoff
documentation
VerifiedTrustedCommunity
Write a handoff prompt for a future session. A handoff is a continuation-link — minimal context plus a kickoff line the user can copy-paste. Never a diagnosis, never an investigation script, never a prescribed deliverable.
1SKILL.mdUpdated May 10, 2026
api-haus/delegate
testing
VerifiedTrustedCommunity
Multi-agent orchestration mode. The orchestrator never reads, edits, runs, or tests directly — it scopes work, runs a re-implementation audit, presents a freeform method brief with grounded recommendations, then dispatches every step to sub-agents through shared context files at `docs/orchestrate/<topic>/`. Use when invoked via /delegate, when the user asks to orchestrate or coordinate multi-agent work, or when the task explicitly calls for delegation.
1SKILL.mdUpdated May 10, 2026