sefaertunc

Conflict Resolver — Git skill for Claude Code

Git community

Resolve merge conflicts on develop branch.

How to install Conflict Resolver

Installs to ~/.claude/commands/sefaertunc-worclaude-conflict-resolver.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/sefaertunc/Worclaude/HEAD/.claude/commands/conflict-resolver.md -o ~/.claude/commands/sefaertunc-worclaude-conflict-resolver.md

Restart Claude Code, or start a new session, for it to be picked up.

What Conflict Resolver does

description: "Resolve merge conflicts on develop branch"

You are resolving merge conflicts. ONLY resolve conflicts — do not update PROGRESS.md, SPEC.md, or bump versions. That is /sync's job.

Step 1: Detect

Run: git status Identify all files with merge conflicts (listed as "both modified"). If no conflicts found, report "No conflicts detected" and stop.

Step 2: Understand

For each conflicted file:

Read the file and find all <<<<<<< / ======= / >>>>>>> markers
Understand wh

Alternatives in Git

Push And Release — Git pull, resolve conflicts, push, fix hook errors, then release 1.6k ★
GitHub Review PR — Use when a PR needs full review — resolves merge conflicts with the base first, then fixes CI failures, then a 1.5k ★
Maestro Merge — Merge session worktree branch back to main 530 ★