메뉴
Use when you need to resolve an in-progress git merge/rebase conflict.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
Use this skill to rebase gh-stack branches and resolve conflicts. Replaces raw git rebase for stack workflows. Triggers: restack, rebase, rebase on main, branches out of date, resolve conflicts.
Use this skill for GitHub Stacked PRs (gh-stack) stack status, branch creation, stack navigation, restructuring a stack, or general gh-stack operations. Replaces raw git checkout -b, git rebase, git push, and gh pr create for stack workflows.
Use this skill to push a gh-stack stack and create or update stacked pull requests. Replaces git push and gh pr create for stack workflows. Triggers: push, ship it, send this up, submit, update PRs, create PR, push stack, send PRs.
Use this skill to sync a gh-stack stack with its remote and trunk. Triggers: sync, update from main, update from trunk, pull trunk, refresh stack.
Use this skill for GitHub Stacked PRs (gh-stack) stack status, branch creation, stack navigation, restructuring a stack, or general gh-stack operations. Replaces raw git checkout -b, git rebase, git push, and gh pr create for stack workflows.
Use this skill to sync a gh-stack stack with its remote and trunk. Triggers: sync, update from main, update from trunk, pull trunk, refresh stack.
| name | resolving-merge-conflicts |
| description | Use when you need to resolve an in-progress git merge/rebase conflict. |
See the current state of the merge/rebase. Check git history, and the conflicting files.
Find the primary sources for each conflict. Understand why each change was made and what the original intent was. Read commit messages and use /vault plus vlt search/read/links to recover related specs, tickets, decisions, and research.
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Keep behavior within the two source intents and finish the active merge or rebase.
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage only the resolved scope. Commit a merge when Git requires it; for a rebase, continue non-interactively until every commit is rebased.
