jnelken

Resolve Conflict — Git skill for Claude Code

Git community

You are resolving git merge/rebase conflicts.

How to install Resolve Conflict

Installs to ~/.claude/skills/jnelken-ai-tools-resolve-conflict/SKILL.md

Terminal
mkdir -p ~/.claude/skills/jnelken-ai-tools-resolve-conflict && curl -fsSL https://raw.githubusercontent.com/jnelken/ai-tools/HEAD/commands/resolve-conflict.md -o ~/.claude/skills/jnelken-ai-tools-resolve-conflict/SKILL.md

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

What Resolve Conflict does

You are resolving git merge/rebase conflicts. Follow this procedure, and **briefly tell the user what you're doing and what you found at each step** before moving to the next.

Steps

  1. **Identify conflicted files**: Run `git diff --name-only --diff-filter=U` to list all files with conflicts. Tell the user how many files are conflicted and which areas of the codebase they touch (e.g. "12 files — mostly routes and services, plus one migration").

  2. **Understand the conflict pattern**: Sample

Alternatives in Git

Full documentation available on GitHub

View Source Repository

Related Skills

Rebase PR — Git skill for Claude Code

Rebase PR

Use when: rebasing a PR branch onto main and the rebase produces conflicts. Triggers on: rebase origin/main, r

Git community
Conflict Resolver — Git skill for Claude Code

Conflict Resolver

Resolve merge conflicts on develop branch

Git community
Vault Resolve Conflict — Git skill for Claude Code

Vault Resolve Conflict

Resolve real git merge conflicts in vault files (propose only, human confirms)

Git community
Rebase On Main — Git skill for Claude Code

Rebase On Main

Rebase the current branch on origin/main and resolve any conflicts.

Git community
Rewrite History — Git skill for Claude Code

Rewrite History

Reimplement the current branch with a clean, narrative-quality git commit history suitable for reviewer compre

Git community
Cc Remote — Git skill for Claude Code

Cc Remote

Use cc_execute/cc_check to run tasks on the user's local machine via Claude Code. Triggers when user asks to r

Git community

Related Agents

Git Assistant — Research agent for Claude Code

Git Assistant

Use this agent for complex git operations like rebasing, cherry-picking, resolving merge conflicts, managing b

Research community
Git Reconciler — Development agent for Claude Code

Git Reconciler

Git branch reconciliation specialist using git and the gh CLI. Use whenever there are merge conflicts, a diver

Development community
Merge Resolver — Development agent for Claude Code

Merge Resolver

Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict

Development community