artificemachine

Conflict Resolve — Design skill for Claude Code

Design community

Conflict Resolution: Design + Code Both Changed.

How to install Conflict Resolve

Installs to ~/.claude/skills/artificemachine-pencil-sync-conflict-resolve/SKILL.md

Terminal

mkdir -p ~/.claude/skills/artificemachine-pencil-sync-conflict-resolve && curl -fsSL https://raw.githubusercontent.com/artificemachine/pencil-sync/HEAD/prompts/conflict-resolve.md -o ~/.claude/skills/artificemachine-pencil-sync-conflict-resolve/SKILL.md

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

What Conflict Resolve does

Conflict Resolution: Design + Code Both Changed

Both the .pen design file and the code have been modified since the last sync. You need to merge both sets of changes intelligently.

Design

Pen file: {{PEN_FILE}}
Screens affected: {{SCREENS}}

Code

Code directory: {{CODE_DIR}}
Framework: {{FRAMEWORK}}
Styling: {{STYLING}}
Changed code files:
{{CHANGED_CODE_FILES}}

Instructions

First, read BOTH sides to understand all changes:
- Use Pen

Alternatives in Design

Brand Guidelines — Apply Anthropic's official brand colors and typography to artifacts 94.1k ★
Od Contribute — Open a first-contribution PR (or bug issue) on nexu-io/open-design — works for non-coders too 91.8k ★
Export Diagram — Export a diagram-design HTML file to .svg and .png next to the source 27.2k ★

Full documentation available on GitHub

View Source Repository