Skills
.Work. You
Rest

resolve-conflicts

Community

Structured plan-first conflict resolution

Software Engineering#Git#imports#merge conflicts#conflict resolution#tests
Authorgahoccode
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a structured framework for merging conflicts (imports, tests, lock files, configs, and deleted-modified files) with backup and analysis steps, avoiding ad-hoc merges.

Core Features & Use Cases

  • Plan-first approach with explicit resolution plan
  • Separate phases for deleted-modified, generated, imports, tests, and code
  • Generated file regeneration and test coverage preservation
  • Clear decision prompts when inputs are unclear

Quick Start

Present a merge plan to the user, await approval, then execute conflict resolution steps with traceable decisions.

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-conflicts
Download link: https://github.com/gahoccode/PRDs/archive/main.zip#resolve-conflicts

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 471,000+ vetted skills library on demand.