Skills
.Work. You
Rest

resolve-conflict

Community

Navigate and resolve disagreements.

Software Engineering#git#workflow#merge conflicts#conflict resolution#agent disagreement
AuthorEtroxTaran
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a structured approach to resolving conflicts, whether they arise from Git merge issues or disagreements between AI agents.

Core Features & Use Cases

  • Git Conflict Resolution: Offers guidance on identifying, analyzing, and resolving various types of Git conflicts.
  • Agent Disagreement Reconciliation: Provides a framework for comparing agent assessments and applying resolution rules based on priority and confidence.
  • Use Case: When a Git merge results in conflicting changes, or when two agents propose different solutions to a problem, this Skill helps you systematically decide on the best path forward.

Quick Start

Use the resolve-conflict skill to help reconcile differing recommendations from the planning and implementation agents.

Dependency Matrix

Required Modules

None required

Components

scriptsreferences

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: resolve-conflict
Download link: https://github.com/EtroxTaran/conductor/archive/main.zip#resolve-conflict

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.