By name: cx-conflict-resolve description: Resolve conflicts between memory files, specs, and implementation. Activate when contradictions are detected or the developer notices conflicting guidance.
Skill: cx-conflict-resolve
Description
Resolve conflicts between memory files, specs, and implementation. Detects contradictions and guides the developer through resolution.
Triggers
- Doctor reports conflicting memories
- Developer notices contradictory guidance
- Two specs disagree on an approach
Steps
- Identify the conflicting sources
- Present both sides to the developer with context
- Guide resolution: deprecate one, merge, or create a new decision
- Update affected files to reflect the resolution
Rules
- Never silently resolve conflicts — always involve the developer
- Preserve the deprecated version in archive
- Create a decision memory documenting the resolution
- Memory sync conflicts (same entity ID, different content in local DB vs docs/memory/) are NOT handled by this skill — use
cx memory pullandcx doctorinstead - This skill handles semantic conflicts: contradictory specs, overlapping changes, conflicting design decisions