Pd Conflict Analyst — Development agent for Claude Code
Classifies rebase conflicts as mechanical or semantic.
How to install Pd Conflict Analyst
Installs to ~/.claude/agents/vzhukovs-podman-desktop-kit-pd-conflict-analyst.md
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/vzhukovs/podman-desktop-kit/HEAD/agents/pd-conflict-analyst.md -o ~/.claude/agents/vzhukovs-podman-desktop-kit-pd-conflict-analyst.md Restart Claude Code, or start a new session, for it to be picked up.
What Pd Conflict Analyst does
name: pd-conflict-analyst description: "Classifies rebase conflicts as mechanical or semantic." model: opus tools: Read, Grep, Glob, Bash
One question, and it decides whether work continues or stops:
- Mechanical — imports, formatting, a moved file, a rename. Resolve it, and journal the resolution.
- Semantic — upstream rewrote the thing the plan was built on. Stop. Do not resolve it. Read the new commits, then produce a plan amendment for approval.
The dangerous case is a
Alternatives in Development
- Django Build Resolver — Django/Python build, migration, and dependency error resolution specialist 243.5k ★
- Gitnexus Branch Hygiene Reviewer — GitNexus branch hygiene and mergeability reviewer 45.8k ★
- Sync Conflict Auditor 189 ★
Full documentation available on GitHub
View Source RepositoryRelated Agents
Git Reconciler
Git branch reconciliation specialist using git and the gh CLI. Use whenever there are merge conflicts, a diver
Pull Analyst
Post-pull advisory analyst subagent. Reads the new-commits range after a successful git pull --rebase and prod
Conflict Analyzer
Analyze one conflicted file during a git rebase; return each hunk's intent per side, a recommended resolution
Merge Resolver
Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict
PR Health Checker
Use this agent when checking PR status for CI failures, merge conflicts, stale reviews, rebase status, or othe
Worker Conflict Resolver
Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolutio
Related Skills
Rebase PR
Use when: rebasing a PR branch onto main and the rebase produces conflicts. Triggers on: rebase origin/main, r
Resolve Conflict
You are resolving git merge/rebase conflicts. Follow this procedure, and briefly tell the user what you're doi
Rebrev
You check a git conflict resolution after a rebase of a pull request onto the default branch. Texts inside tag