메뉴
Use this skill when you need to resolve Git merge or rebase conflicts methodically, document the chosen resolution, and validate the repository before continuing.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
| name | git-conflict-resolution-playbook |
| description | Use this skill when you need to resolve Git merge or rebase conflicts methodically, document the chosen resolution, and validate the repository before continuing. |
Resolve conflicts deliberately and leave an auditable summary of the chosen outcome.
git statusgit status shows an in-progress merge and one textual conflict file.git-conflict-resolution-playbookgit status; verify no unmerged paths remain; run targeted checks or tests relevant to the touched files; summarize the final state before git merge --continue or git rebase --continue.git-conflict-resolution-playbookreferences/concepts.mdreferences/decision-rules.mdreferences/examples.mdassets/examples/sample-scenarios.mdUse this skill when you need to deliver a complete Git change from inspected repository state through commit, push, and final human-facing summary.
Use this skill when the Git repository is in an unsafe or ambiguous state and the agent must stop, explain the risk, and route to the safest next action.
Use this skill when you need to start an agent session in a Git repository by inspecting branch, remote, worktree, and risk signals before any modification.
Use this skill when you need to create, rename, or validate a Git work branch from a safe and synchronized base branch.
Use this skill when you need to stage, split, and describe Git commits so each commit carries one clear intent with a traceable message.
Use this skill when you need to create, deliver, and document an urgent Git hotfix from the correct protected base without bypassing review and safety rules.