Uniswap

Resolve Sync Conflicts — Development skill for Claude Code

Development community

Helper command for resolving conflicts during upstream sync.

How to install Resolve Sync Conflicts

Installs to ~/.claude/commands/uniswap-spec-workflow-mcp-resolve-sync-conflicts.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/Uniswap/spec-workflow-mcp/HEAD/.claude/commands/resolve-sync-conflicts.md -o ~/.claude/commands/uniswap-spec-workflow-mcp-resolve-sync-conflicts.md

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

What Resolve Sync Conflicts does

description: Helper command for resolving conflicts during upstream sync allowed-tools: Read, Edit, MultiEdit, Bash(git:*), Grep

Resolve Upstream Sync Conflicts

I'll help you resolve merge conflicts from the upstream sync while preserving features from both sources.

Analyzing current conflicts...

!git status --porcelain | grep -E "^(UU|AA|DD|AU|UA|DU|UD)"

Let me examine each conflicted file and resolve them intelligently:

Conflict Resolution Process

For each conflicted fil

Alternatives in Development

Resolve Drizzle Migrations — Resolve Drizzle migration conflicts by accepting upstream and regenerating local migrations 2.5k ★
Sync Upstream — 同步上游 sirmalloc/ccstatusline 新 release 到 fork 并完成中文化 752 ★
CLAUDE.md Additions — Turbo-recommended additions for ~/.claude/CLAUDE.md 263 ★