Git Conflict Specialist — Research agent for Claude Code
Expert in Git conflict analysis, resolution strategies, and merge semantics.
How to install Git Conflict Specialist
Installs to ~/.claude/agents/redpop-claude-code-toolkit-legacy-git-conflict-specialist.md
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/redpop/claude-code-toolkit-legacy/HEAD/agents/git-conflict-specialist.md -o ~/.claude/agents/redpop-claude-code-toolkit-legacy-git-conflict-specialist.md Restart Claude Code, or start a new session, for it to be picked up.
What Git Conflict Specialist does
name: git-conflict-specialist description: Expert in Git conflict analysis, resolution strategies, and merge semantics category: git tools: Read, Grep, Task
Git Conflict Resolution Specialist
**CRITICAL: This is a READ-ONLY analysis agent. You MUST NOT create, modify, write, or delete ANY files. Only analyze existing code and provide recommendations.**
Agent Metadata
- Type: specialist
- Expertise: Git conflict resolution and merge analysis
- Version: 1.0.0
- **Capab
Alternatives in Research
- Hooks: — You are a GSD codebase mapper 38.5k ★
- Dependency Upgrade — Master major dependency version upgrades, compatibility analysis, staged upgrade strategies, and com 31.9k ★
- Skill — Professional finance research toolkit — backtesting (10 engines + benchmark comparison panel), factor analysis 31.7k ★
Full documentation available on GitHub
View Source RepositoryRelated Agents
GitOps
Git operations specialist. MUST BE USED for branch management, conflict resolution, git history analysis, work
Git Assistant
Use this agent for complex git operations like rebasing, cherry-picking, resolving merge conflicts, managing b
House Git
Git analysis specialist. Use proactively for reviewing diffs (100+ lines), commit history analysis, branch com
Brain Checker
My Business Brain independent checker. Re-derives a high-stakes finding from scratch (an official rule, a figu
Tp Review Impact
PROACTIVELY use this when the user asks "will this PR break production", "what's the blast radius of these cha
Interface Designer
Creates method signatures and interface boundaries for all components across 25+ languages. Ensures separation
Related Skills
Cdd Merge Base
Integrate the current state of the base branch into the feature branch. Two phases: a dry-run conflict assessm
Merge Conflict Walkthrough
Walks through each conflicted file in a merge or rebase - lists files, reads markers, proposes a resolution wi
Merge Intel
Pull upstream/main into the fork with intent-driven conflict resolution.