Skills
.Work. You
Rest

work_git_conflict-resolver

Community

Resolve Git conflicts with actionable guidance.

Software Engineering#git#workflow#code-analysis#conflict-resolution#branch-management#merge-conflicts#rebases
AuthorJoNaYeon
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Conflict resolution for Git merges and rebases, guiding users to resolve conflicts efficiently and correctly.

Core Features & Use Cases

  • Analyzes unmerged files and conflict markers to identify conflict blocks.
  • Proposes structured resolution strategies and justification for each block.
  • Provides a guided, reproducible workflow to complete merge or rebase operations.

Quick Start

Run the conflict resolver when you encounter a merge or rebase conflict to analyze conflict blocks and receive a recommended resolution plan, then apply the suggested changes and continue the operation.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 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: work_git_conflict-resolver
Download link: https://github.com/JoNaYeon/claude-code-skills/archive/main.zip#work-git-conflict-resolver

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.