Skills
.Work. You
Rest

custom-conflict-resolution

Community

Resolve Git conflicts with precision.

Software Engineering#git#version control#codebase#merge#rebase#conflict resolution
Authorassertchris
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill automates the resolution of Git merge conflicts, ensuring a clean and accurate codebase by carefully analyzing and merging changes.

Core Features & Use Cases

  • Rebase-first Strategy: Prioritizes using git rebase for a cleaner commit history.
  • One-File-at-a-Time Resolution: Analyzes and resolves conflicts individually for thoroughness.
  • Preserves Best Code: Thoughtfully merges code from both branches to retain optimal functionality.
  • Use Case: When merging a feature branch into main results in conflicts, this skill will guide you through resolving each file systematically, preventing accidental code loss or introduction of bugs.

Quick Start

Use the custom-conflict-resolution skill to resolve the current git merge conflicts.

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: custom-conflict-resolution
Download link: https://github.com/assertchris/claude-skills/archive/main.zip#custom-conflict-resolution

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.