Resolve Sync Conflicts
Description
--- 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
Installation
Installs to ~/.claude/commands/uniswap-spec-workflow-mcp-resolve-sync-conflicts.md
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.
Full documentation available on GitHub
View Source RepositoryRelated Skills
Auto Update
Pull the latest ECC repo changes and reinstall the current managed targets.
Ecc Guide
Navigate ECC's current agents, skills, commands, hooks, install profiles, and docs from the live repository su
Epic Claim
Claim an epic issue, stamp coordination state, and sync local ownership.
Epic Publish
Publish a validated epic update back to the issue and local cache.
Epic Review
Mark epic review requested, approved, or changes requested.
Epic Unblock
Sweep blocked epic issues and reopen anything whose dependencies are closed.