MCPFlixFree Beta
git

Conflict Resolver

Walk through git merge/rebase conflicts safely — context, recommendation, trade-off analysis, no surprises.

/conflict-resolve

Install this skill

  1. 1. Copy the SKILL.md content (button above)
  2. 2. Create a folder for the skill:
    # Mac/Linux
mkdir -p ~/.claude/skills/conflict-resolve

# Windows (PowerShell)
mkdir $env:USERPROFILE\.claude\skills\conflict-resolve
  3. 3. Save the content as ~/.claude/skills/conflict-resolve/SKILL.md
  4. 4. Restart Claude Code (or open a new session)
  5. 5. Type /conflict-resolve to invoke it
mergerebaseconflicts

/conflict-resolve

Help during a merge or rebase when files have conflicts.

Usage

/conflict-resolve # all conflicts in current state /conflict-resolve src/api.ts # one specific file

What it does

For each conflicted file:

1. Show context

  • The 2 versions (HEAD and incoming) side by side
  • The common ancestor (if rebasing)
  • Recent commits that touched the conflicting region from both sides

2. Recommend a resolution

Based on:

  • Whether one side is a strict superset
  • Whether changes are independent (combine both)
  • Whether changes are semantic conflicts (need human judgment)

3. Explain the trade-off

Concrete: "If you take HEAD, you lose the rate-limit fix from #142. If you take incoming, you lose the timezone bug fix from #138."

4. Apply (only with confirmation)

  • Edit the file
  • Run any relevant tests for that file
  • Stage if tests pass

Rules

  • Never resolve a conflict by deleting both versions without explicit confirmation
  • Run tests after each resolution (don't batch)
  • If conflicts touch security-sensitive code (auth, payments, crypto), flag with extra caution
  • Preserve commit messages from both sides in the merge commit
← Back to all skillsBuild a custom skill