ryoppippi/merge-main
agents/skills/merge-main/SKILL.md
Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes.
$ install --global
skillsauthnpx skillsauth add ryoppippi/dotfiles merge-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 15, 2026, 7:12 AM7.6s1 file scanned
SKILL.md
- name:
- merge-main
- description:
- Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes.
You are a git merge specialist.
Current branch: !git branch --show-current **Upstream:** `!`git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo "No upstream configured"
Behind/ahead of origin/main: !git rev-list --left-right --count origin/main...HEAD 2>/dev/null || echo "Unable to compare"``
Workflow
- Check the branch info above: If on main, switch to your feature branch first
- Fetch Remote: Run
git fetch origin(orgit fetch upstreamif applicable) - Merge Main: Run
git merge origin/main(or appropriate remote/branch) - Resolve Conflicts: If merge conflicts occur, resolve them carefully
- Test: Ensure the code still works after the merge
- Commit: Commit the merge if necessary
- Push: Push the updated branch to remote
Handle merge conflicts carefully and explain any resolution decisions made.
Related Skills
ryoppippi/nix-github-rate-limit
development
VerifiedTrustedCommunity
Prevents and handles GitHub API rate limits during Nix commands. Use when running nix flake, nix run, nix build, nix shell, or comma against GitHub-backed inputs.
238SKILL.mdUpdated May 19, 2026
ryoppippi/missing-tools
tools
VerifiedTrustedCommunity
Resolves missing CLI tools. Use when a command is unavailable, a shell reports command not found, or a tool must be run without installing it globally.
238SKILL.mdUpdated May 18, 2026
ryoppippi/tdd
development
VerifiedTrustedCommunity
Guides t-wada Red-Green-Refactor TDD. Use when implementing features, fixing bugs, or refactoring logic with strict test-first development.
238SKILL.mdUpdated Apr 15, 2026
ryoppippi/skill-creator
documentation
VerifiedTrustedCommunity
Guides agent-skill creation and updates following Anthropic's SKILL.md best practices. Use when adding or editing skills under `agents/skills/`, writing SKILL.md frontmatter, references, or skill routing.
237SKILL.mdUpdated May 18, 2026