Conflux Conflict Resolver

Resolve merge conflicts and complete sequential merges during Conflux parallel execution.

CRITICAL: This skill CANNOT ask questions to users. All decisions must be made autonomously based on available context.

Purpose

When Conflux processes multiple changes in parallel, merge conflicts may arise when integrating change branches into the target branch. This skill provides the fixed guidance for conflict resolution, including pre-sync requirements, merge commit conventions, and safety constraints.

Conflict Resolution Rules

• If openspec/CONSTITUTION.md exists, read it before conflict resolution and treat it as higher-priority project law than proposal/spec deltas.

Safety Constraints