resolve-conflict

Name: resolve-conflict
Availability: InStock
Author: unicorn-plugins

Resolve discrepancies between specification files and source code.

21|Updated Feb 8, 2026

Search Tags:#automation #developer tools #version control #code sync #conflict resolution #spec management

Ready to run

npx skills add https://github.com/unicorn-plugins/dmap --skill resolve-conflict

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: resolve-conflict
Source: https://github.com/unicorn-plugins/dmap/tree/main/spec-driven-team/.claude-plugin/skills/resolve-conflict
Command: npx skills add https://github.com/unicorn-plugins/dmap --skill resolve-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill resolves discrepancies between specification files and actual code, ensuring your project stays synchronized and up-to-date.

Core Features & Use Cases

Conflict Resolution: Automatically or manually reconcile differences between specification documents and source code.
Synchronization: Updates code based on the latest specifications or reverts code to a specification-driven state.
Use Case: When a developer updates a feature's logic without updating its corresponding Markdown specification, this Skill can either automatically update the spec based on the code or regenerate the code to match the spec, based on your choice.

Quick Start

Use the resolve-conflict skill to automatically update specifications based on current code for all conflicting files.

Frequently Asked Questions about resolve-conflict

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I resolve discrepancies between specification files and source code?▼

To resolve discrepancies between specification files and source code, you can use automated or manual synchronization options. This updates your code based on the latest specs or reverts code back to a specification-driven state to ensure project integrity.

What is code-to-spec synchronization and when do I need it?▼

Code-to-spec synchronization is the process of automatically updating specification documents to match recent changes in your source code. You need this when a developer updates feature logic without writing the corresponding Markdown specification updates.

How do I automatically update Markdown specs based on current code?▼

You can automatically update Markdown specs based on current code by running the conflict resolution workflow across all conflicting files. This synchronizes your documentation with the actual implementation without requiring manual file edits.

Does spec-to-code regeneration revert my latest feature logic changes?▼

Spec-to-code regeneration reverts your source code to match the original specification documents. If a developer updated feature logic without updating the spec, this synchronization option discards those code changes to restore the specification-driven state.

Can I stage commits and create backups before synchronizing conflicting files?▼

Yes, you can stage commits and create backups before synchronizing conflicting files. The conflict resolution workflow ensures project integrity by staging your version control commits and backing up data before applying spec or code updates.

What is the best way to manage version control conflicts during spec management?▼

The best way to manage version control conflicts during spec management is to use an automated synchronization workflow that detects code and spec discrepancies, stages commits, and offers manual or automated reconciliation options.