메뉴
Intelligently merge branches with context-aware conflict resolution
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
| name | merge |
| description | Intelligently merge branches with context-aware conflict resolution |
| allowed-tools | Bash(git :*), Bash(gh :*), Read, Edit, MultiEdit, Task |
| argument-hint | <branch-name> |
| disable-model-invocation | true |
| allow_implicit_invocation | false |
Merge branches intelligently by understanding feature context and resolving conflicts efficiently.
git branch --show-currentgit status --shortgit log --oneline -5CONTEXT GATHERING:
git branch --show-current to identify current branchgit status to ensure clean working treeFEATURE ANALYSIS:
gh pr list --head <branch-name>gh pr view <number> --json title,body,filesMERGE ATTEMPT:
git fetch origin <branch-name>git merge origin/<branch-name> --no-commitgit status --porcelainCONFLICT DETECTION:
git commit with descriptive messagegit diff --name-only --diff-filter=USMART RESOLUTION: For each conflicted file:
VERIFICATION:
git diff --cached to review changesgrep -r "<<<<<<< HEAD"git add -A and commitgit merge --abort and report blockersExpert guidance for creating, building, and using Claude Code agents and the Task tool. Use when working with agents, setting up agent configurations, understanding how agents work, or using the Task tool to launch specialized agents.
Complete SaaS ideation to implementation workflow - from idea discovery to task breakdown
Run structured APEX implementation (Analyze, Plan, Execute, eXamine) with parallel agents, tests, adversarial review, and proof-backed verification. Use for features, bug fixes, or code changes that need disciplined execution and real-flow evidence.
Deep iterative research using progressive flow psychology (diverge-analyze-converge-execute) with parallel agents, skeptical analysis, and multi-perspective synthesis. Use for thorough topic exploration, decision-making research, or when you need battle-tested conclusions.
Automated CI/CD pipeline fixer - watches CI, fixes errors locally, commits, and loops until green. Use when CI is failing and you want to automatically fix and verify changes.
Improve unclear UX copy, error messages, microcopy, labels, and instructions. Makes interfaces easier to understand and use.