Merge resolver

Skill magnusrodseth/dotfiles/.claude/skills/merge-resolver

⚙️ There are many like them, but these dotfiles are mine. A stow-managed macOS setup: Zsh, Neovim, tmux, Ghostty, and a pile of Claude Code tooling.

Install

npx -y skills add magnusrodseth/dotfiles --skill merge-resolver

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

2 things to look at

no licenseNo license file was found in the repository. Code published without one is not open source by default, so using it at work is a question for whoever answers licensing questions where you are.
2 stars2 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Git expert that analyzes merge conflicts by examining branches, commits, and diffs to provide resolution recommendations. Use when there are merge conflicts to resolve. Triggers on "merge conflict", "resolve conflict", "git conflict", "CONFLICT in", or when git status shows unmerged paths.

SKILL.md

2.6 KB, 528 tokens by cl100k_base, as published. Nobody here has run it

Merge Conflict Resolver

Analyze conflicts thoroughly and provide clear, actionable recommendations. Do NOT directly edit or resolve files; provide recommendations only.

Workflow

1. Understand the Current State

git status                           # Conflicting files
git branch -vv                       # Current branch and tracking info
git log --oneline -10                # Recent commits on current branch

2. Analyze Both Sides

Current branch (ours):

git log --oneline HEAD~10..HEAD
git log -p -1 <file>

Incoming branch (theirs):

git log --oneline MERGE_HEAD~10..MERGE_HEAD
git log -p MERGE_HEAD -1 -- <file>

3. Examine Conflict Context

git diff --name-only --diff-filter=U          # All conflicting files
git diff                                       # Conflict markers
git show :1:<file>                            # Common ancestor
git show :2:<file>                            # Ours
git show :3:<file>                            # Theirs

4. Investigate History

git log --oneline --all --graph -20
git log -p --follow -- <file>
git blame <file>

Response Format

Conflict Summary: What's conflicting and why
Branch Analysis: What each branch intended to accomplish
Root Cause: Why these changes conflict (parallel edits, refactoring, etc.)
Resolution Options: Ranked recommendations with trade-offs
- Option A: Keep ours because...
- Option B: Keep theirs because...
- Option C: Manual merge combining both because...
Recommended Resolution: Expert recommendation with exact steps
Risk Assessment: What could break if resolved incorrectly

Conflict Types

Content conflicts: Examine semantic meaning, not just lines
Rename/rename: Check git log --follow for both paths
Delete/modify: Understand why one side deleted
Binary: Cannot auto-merge, recommend manual choice
Rebase: Check git rebase --show-current-patch

Rules

NEVER edit files or resolve conflicts directly; recommendations only
NEVER assume intent without checking commit messages
ALWAYS examine both sides before recommending
Consider semantic meaning, not just line-by-line differences
Flag if the conflict suggests deeper architectural issues
Be explicit about uncertainty when commit messages are unclear