jasonwarrenuk/merge-from-main
skills/merge-from-main/SKILL.md
{{ 𝛀𝛀𝛀 }} Merge from main
$ install --global
skillsauthnpx skillsauth add jasonwarrenuk/goblin-mode merge-from-mainInstall 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: Apr 6, 2026, 2:17 AM4.4s1 file scanned
SKILL.md
- name:
- merge-from-main
- description:
- {{ 𝛀𝛀𝛀 }} Merge from main
- model:
- opus
- disable-model-invocation:
- true
- allowed-tools:
- ["Bash(git:*)", "Read", "Glob", "Grep", "Edit"]
- argument-hint:
- ["advice or guidance when merging"]
<task name="Merge Main into Current Branch">
<user-guidance>$ARGUMENTS</user-guidance>
<steps>
1. Check current branch name and confirm with user
2. Do NOT create a worktree - work in the current directory
3. Run `git fetch origin main && git merge origin/main`
4. If conflicts exist, list them and resolve preserving our branch's intent.
5. Run tests to verify
6. Push with `git push`
</steps>
</task>
Related Skills
jasonwarrenuk/Pull Request: Review & Comment
documentation
VerifiedTrustedCommunity
{{ 𝛀𝛀𝛀 }} Review a pull request and post a comment
5SKILL.mdUpdated Jun 11, 2026
jasonwarrenuk/Create Artefact:Roadmap
development
VerifiedTrustedCommunity
{{ ƔƔƔ }} Generate an HTML dashboard showing the current state of a project roadmap.
5SKILL.mdUpdated Jun 11, 2026
jasonwarrenuk/Pull Request: Review
tools
VerifiedTrustedCommunity
{{ 𝛀𝛀𝛀 }} Review a pull request
5SKILL.mdUpdated Apr 6, 2026
jasonwarrenuk/repo-investigate
development
VerifiedTrustedCommunity
{{ 𝛀𝛀𝛀 }} Investigate a codebase in detail
5SKILL.mdUpdated Apr 6, 2026