メニュー
Resolve merge conflicts file-by-file. Use when a merge/rebase has conflicts, a PR can't merge, "fix conflicts" is requested, or branches have diverged.
デフォルトでは、最初にソースを確認する Prompt が選択されています。直接コマンドに切り替えるか、ローカルコピーをダウンロードすることもできます。
インストールを決める前に、SKILL.md と SkillsMP に表示されている付属ファイルをお読みください。
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
直接コマンドでは確認用 Prompt が省略されます。実行前にソースを確認してください。
npx skills add https://github.com/laurigates/claude-plugins --skill git-conflictsコマンドは1行のまま表示されます。コピー前に横へスクロールして全体を確認してください。
ローカルで確認しますか？SkillsMP が現在取得できるファイルをダウンロードできます。
SOC 職業分類に基づく
SKILL.md を表示中
| name | git-conflicts |
| description | Resolve merge conflicts file-by-file. Use when a merge/rebase has conflicts, a PR can't merge, "fix conflicts" is requested, or branches have diverged. |
| allowed-tools | Bash(git status *), Bash(git diff *), Bash(git log *), Bash(git show *), Bash(git add *), Bash(git commit *), Bash(git push *), Bash(git merge *), Bash(git checkout *), Bash(git rebase *), Bash(git restore *), Bash(git config *), Bash(git rerere *), Bash(gh pr *), Read, Edit, Grep, Glob, TodoWrite |
| args | [file-or-pr] [--ours] [--theirs] [--push] |
| argument-hint | file path, PR number, --ours, --theirs, or --push |
| disable-model-invocation | true |
| created | "2026-03-01T00:00:00.000Z" |
| modified | "2026-06-18T00:00:00.000Z" |
| reviewed | "2026-05-23T00:00:00.000Z" |
Resolve merge conflicts using modern git features.
| Use this skill when... | Use git-ops agent instead when... |
|---|---|
| Merge or rebase produced conflicts | Complex multi-branch cherry-pick across many commits |
| PR shows "can't merge" / "fix conflicts" | Conflicts require deep business logic understanding |
| Config files (JSON, YAML, lockfiles) diverged | Interactive rebase with squash/fixup needed |
Need to accept one side wholesale (--ours/--theirs) | Architectural redesign spanning many files |
git branch --show-currentgit status --porcelain=v2 --branchfind .git -maxdepth 1 -name 'MERGE_HEAD' -o -name 'REBASE_HEAD' -o -name 'rebase-merge' -o -name 'rebase-apply'git diff --name-only --diff-filter=Ugit config --default '' merge.conflictStylegit config --default '' rerere.enabledgit versionParse these from $ARGUMENTS:
$1: File path (resolve single file) OR PR number (fetch and merge base branch)--ours: Accept current branch version for all conflicts--theirs: Accept incoming branch version for all conflicts--push: Push after resolution is committedExecute this conflict resolution workflow:
MERGE_HEAD, REBASE_HEAD, rebase-merge, rebase-apply)gh pr view <number> --json headRefName,baseRefName,mergeablegit fetch origin <base-branch>git merge origin/<base-branch> --no-ffgh pr list --head $(git branch --show-current) --json number,baseRefName,mergeablegit diff --name-only --diff-filter=UCheck the conflict style from context. If merge.conflictStyle is not zdiff3:
git config merge.conflictStyle zdiff3git checkout --conflict=zdiff3 -- <file> for each conflicted filegit config rerere.enabled truegit config rerere.autoupdate true (auto-stages files resolved by rerere)This gives three-way conflict markers with the common ancestor, compacted by removing shared lines at conflict boundaries. Much easier to resolve than the default two-way markers.
If --ours flag: Accept current branch for all conflicted files:
git restore --ours -- <file> # for each file
git add <file>
If --theirs flag: Accept incoming branch for all conflicted files:
git restore --theirs -- <file> # for each file
git add <file>
Otherwise, resolve each file intelligently:
For each file from git diff --name-only --diff-filter=U:
<<<<<<< HEAD
(current branch changes)
||||||| (common ancestor)
(what the code looked like before both changes)
=======
(incoming changes)
>>>>>>> branch-name
||||||| section (common ancestor) shows what both sides started from — use it to understand intent| File Type | Strategy |
|---|---|
package.json, plugin.json | Merge objects/arrays, take higher versions |
| YAML config | Merge keys from both sides |
CHANGELOG.md | Include entries from both sides in chronological order |
README.md, docs | Include content from both sides |
| Source code | Integrate both changes preserving logic of each |
Lock files (bun.lock, package-lock.json) | Delete and regenerate after resolving other files |
.release-please-manifest.json | Take higher version numbers |
<<<<<<<, |||||||, =======, >>>>>>>) and combine changesgit add <file>Important ours/theirs note for rebases: During git rebase, the meaning of ours/theirs is swapped — --ours refers to the branch being rebased onto (usually main), --theirs refers to your feature branch commits.
<<<<<<<git diff --name-only --diff-filter=U returns empty (no remaining unmerged paths)git rerere statusgit commit --no-editgit rebase --continue--push flag: git push origin $(git branch --show-current)Summarize what was resolved:
gh pr comment <number> --body "Merge conflicts with <base-branch> resolved automatically.
Resolved files:
- file1.json (merged entries from both sides)
- file2.md (combined changelog entries)
"
||||||| section) to understand what both sides changedIf the same conflicts keep recurring, the likely cause is squash merges. Squash-merging breaks the common ancestry chain, so stacked or sibling branches lose their merge base. Rerere mitigates this by replaying recorded resolutions, but the root fix is to avoid squash merges on branches with dependents. When a squashed base leaves a dependent carrying the now-collapsed commits, recover with git rebase --onto origin/main <old-base-tip> <dependent> (see the git-pr skill's Stacked PRs section).
Abort with git merge --abort or git rebase --abort if:
When several branches will land together — a wave of parallel feature branches,
a PR stack, or sibling fixes touching overlapping files — surface and resolve
the conflicts once, on a throwaway branch, before touching main. This also
catches the silent failure a plain auto-merge can't: when two branches each add
the same helper/import in non-adjacent spots, git merges both copies with no
conflict, producing a tree that does not compile. The merge message is not
proof of correctness — only compiling the merged tree is.
# rerere on, so the resolution you do here is recorded for the real merges
git config rerere.enabled true
git config rerere.autoupdate true
git switch -c trial/integration origin/main
for b in <branch-1> <branch-2> <branch-3>; do
git merge --no-ff --no-edit "origin/$b" || git commit --no-edit # resolve, then commit
done
<build + test command> # e.g. just check / cargo test / npm test — the real gate
If the merged tree builds and tests green, the resolution is validated and
rerere has cached it. Discard the trial branch and do the real merges/rebases
in order — rerere auto-replays the same resolution on the actual base merge and
on each dependent's --onto rebase (see git-pr Stacked PRs), so you never
re-resolve by hand:
git switch main && git branch -D trial/integration # the rerere cache persists
Payoff: conflicts surface before main is touched (not mid-merge under
pressure); one resolution is replayed everywhere via rerere; and compiling the
merged tree catches silent duplicate-addition merges a green merge message hides.
| Task | Command |
|---|---|
| List conflicted files | git diff --name-only --diff-filter=U |
| Re-checkout with zdiff3 | git checkout --conflict=zdiff3 -- <file> |
| Accept current branch | git restore --ours -- <file> |
| Accept incoming branch | git restore --theirs -- <file> |
| Recreate conflict markers | git checkout -m -- <file> |
| Check rerere status | git rerere status |
| View rerere diff | git rerere diff |
| Forget bad resolution | git rerere forget <file> |
| Abort merge | git merge --abort |
| Abort rebase | git rebase --abort |
| Continue rebase | git rebase --continue |
| Context | Command |
|---|---|
| List conflicts | git diff --name-only --diff-filter=U |
| Conflict count | git diff --name-only --diff-filter=U | wc -l |
| Full conflict diff | git diff --diff-filter=U |
| PR mergeable state | gh pr view N --json mergeable |
| Check markers remain | grep -rn '<<<<<<<' <files> |
| Porcelain status | git status --porcelain=v2 |
| Detect merge/rebase state | test -f .git/MERGE_HEAD && echo merge || test -d .git/rebase-merge && echo rebase |