Skills
.Work. You
Rest

merge-resolve

Community

Resolve merge conflicts intelligently

Software Engineering#git#developer tools#version control#merge conflict#parallel development#code resolution
Authortgsatwit
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill streamlines the process of resolving merge conflicts that arise from parallel development, reducing friction and saving developer time.

Core Features & Use Cases

  • Conflict Classification: Automatically categorizes merge conflicts into types like Formatting, Additive, Logic, Structural, and Rename.
  • Automated Resolution: Intelligently resolves safe conflicts (Formatting, Additive) based on defined build standards.
  • Contextual Assistance: Presents complex conflicts (Logic, Structural) with detailed context and recommendations for human decision-making.
  • Use Case: When merging feature branches, this Skill can automatically fix style inconsistencies and combine non-conflicting additions, flagging only the critical logic or architectural disagreements for review.

Quick Start

Use the merge-resolve skill to analyze and resolve conflicts in the current repository.

Dependency Matrix

Required Modules

None required

Components

references

💻 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: merge-resolve
Download link: https://github.com/tgsatwit/agent-delivery-pub/archive/main.zip#merge-resolve

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.