skills.rest
EtroxTaran
EtroxTaranCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolve-conflict

Resolve Git conflicts and agent disagreements using predefined resolution rules.

Updated Aug 27, 2026
Search Tags:#git#workflow#merge conflicts#conflict resolution#agent disagreement
One-click install
npx skills add https://github.com/EtroxTaran/conductor --skill resolve-conflict-etroxtaran
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflict
Source: https://github.com/EtroxTaran/conductor/tree/main/collection/skills/resolve-conflict
Command: npx skills add https://github.com/EtroxTaran/conductor --skill resolve-conflict-etroxtaran

SYSTEM DOCUMENTATION & REQUIREMENTS

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

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.

Frequently Asked Questions about resolve-conflict

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

FAQPage Schema
How do I resolve Git merge conflicts systematically?▼

To resolve Git merge conflicts, this Skill analyzes differences between conflicting changes and applies predefined resolution rules to systematically decide the best path forward for code merges.

What is the best way to reconcile disagreements between AI agents?▼

Reconciling agent disagreements involves comparing differing agent assessments and applying resolution rules based on priority and confidence to determine the optimal solution for feature implementation or architectural reviews.

How do I handle architectural review disputes during feature implementation?▼

Handling architectural review disputes requires analyzing the proposed solutions and applying predefined resolution rules, systematically comparing agent weighting and confidence to decide on the best architectural path forward.

Do I need to know Git commands to use this conflict resolution approach?▼

Yes, you need an understanding of Git commands and agent weighting for decision-making, as this Skill requires parsing technical differences and applying rules to resolve both code merges and agent disagreements.

Can I use this framework when planning and implementation agents propose different solutions?▼

Yes, you can use this framework to reconcile differing recommendations from planning and implementation agents by comparing their assessments and applying priority and confidence rules to select the best solution.

Related Skills

Explore More Software Engineering Skills→
twikustwikus
3

merge

Merge Git branches with context-aware conflict resolution using GitHub CLI.

Community
Intermediate
OrestesKOrestesK
2

grill-with-docs

Stress-test implementation plans against codebase, domain terminology, and architectural decisions.

Community
Advanced
moogieonmoogieon

ship

Automate merge, test, review, and deployment workflows with Git and CI/CD.

Community
Advanced
navapbcnavapbc
6

resolve-conflicts

Automate git merge conflict resolution with confidence gating and human approval.

Official
Advanced