菜单
Resolve git merge conflicts by understanding both sides first. Use when you need to resolve conflicts, merge conflict, git conflict, fix merge conflict, resolve merge conflict, handle conflict, or deal with conflicting changes.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Orchestrate Birdhouse child agents to investigate PR review feedback in parallel, classify it as strengthened, weakened, or invalidated, then address approved items serially with fixes or threaded replies.
Create isolated working directories using git worktrees without affecting the main workspace. Use when you want to use worktree, git worktree, worktree workflow, isolated development, work in worktree, create worktree, or worktree best practices.
Reply to GitHub PR review comments as threaded responses using the GitHub API replies endpoint.
Generate release notes from git branch commit history and analyze changes. Use when you want to generate release notes, prepare release notes, prep for a PR, find what changed in this branch, or get branch change summary.
Create GitHub pull requests using gh CLI with proper formatting for multi-line descriptions. Use when you want to create a pr, submit a pr, pull request, create a pull request, submit a pull request, open a pr, or new pr.
Core software development principles: code for readability and changeability, apply DRY wisely, test for confidence, and crash loudly on unexpected conditions.
| name | git-merge-conflict-resolution |
| description | Resolve git merge conflicts by understanding both sides first. Use when you need to resolve conflicts, merge conflict, git conflict, fix merge conflict, resolve merge conflict, handle conflict, or deal with conflicting changes. |
| trigger_phrases | ["merge conflict","resolve merge conflict","fix merge conflict","git conflict"] |
| tags | ["git"] |
Before resolving any merge conflict, understand what changed on both sides.
Conflict markers show where the conflict is, not why it exists.
# For merge conflicts
git merge-base HEAD MERGE_HEAD
# For rebase conflicts
git merge-base HEAD REBASE_HEAD
Save the SHA. You will need it.
git diff <merge-base-sha>..HEAD -- path/to/file.ts
Read this carefully. What did your branch do?
git diff <merge-base-sha>..MERGE_HEAD -- path/to/file.ts
Read this carefully. What did their branch do?
For rebase conflicts, compare against REBASE_HEAD instead of MERGE_HEAD.
cat path/to/file.ts
With both sides understood, decide how the final code should work.
Edit the file to incorporate both changes appropriately, or choose one side if that is clearly correct.
git add path/to/file.ts
git commit
git rebase --continue
Use the command that matches the situation. git commit is for merges. git rebase --continue is for rebases.
These meanings flip between merge and rebase.
Check which state you are in:
test -f .git/MERGE_HEAD && echo "MERGE" || echo "not merge"
test -f .git/REBASE_HEAD && echo "REBASE" || echo "not rebase"
During merge:
--ours = current branch, what you are merging into--theirs = incoming branch, what you are merging fromDuring rebase:
--ours = upstream branch, what you are rebasing onto--theirs = your commits being replayedWhy this flips: rebase checks out the target first, then replays your commits on top.
git checkout --ours path/to/file.ts
git checkout --theirs path/to/file.ts
Use those only when you are certain one side should win.