Skills
.Work. You
Rest

github-conflicts

Community

Safely resolve Git merge conflicts

Software Engineering#git#developer tools#version control#merge#rebase#conflicts
AuthorBreakerOfStems
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a structured and safe protocol for resolving Git merge and rebase conflicts, preventing accidental data loss or incorrect resolutions.

Core Features & Use Cases

  • Conflict Identification: Lists all files with active conflicts.
  • Conflict Analysis: Displays the differing versions of conflicting code sections.
  • Guided Resolution: Offers clear options for resolving conflicts (ours, theirs, manual).
  • Workflow Support: Provides specific steps for both merge and rebase conflict resolution.
  • Abort Functionality: Allows for safe cancellation of merge or rebase operations.
  • Use Case: When merging a feature branch into main, if conflicts arise, this skill guides you through analyzing each conflict and applying the correct resolution without guessing.

Quick Start

Use the github-conflicts skill to help resolve the current merge conflicts by analyzing the differences and guiding the resolution process.

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: github-conflicts
Download link: https://github.com/BreakerOfStems/claude-skills/archive/main.zip#github-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 223,000+ vetted skills library on demand.