vzhukovs

Pd Conflict Analyst — Development agent for Claude Code

Development community

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

Terminal
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

Full documentation available on GitHub

View Source Repository