Skills
.Work. You
Rest

conflict-resolution

Community

Resolve merge conflicts cleanly

Software Engineering#git#collaboration#version control#merge conflict#rebase#code integrity
Authortroykelly
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a systematic process for understanding, analyzing, and resolving merge conflicts in Git, ensuring code integrity and preventing data loss.

Core Features & Use Cases

  • Conflict Identification: Guides users on how to identify files with merge conflicts using git status.
  • Conflict Analysis: Provides a framework for understanding the intent behind conflicting changes and determining the best resolution strategy.
  • Resolution Strategies: Details methods for keeping 'theirs', keeping 'ours', or manually merging changes, including how to remove conflict markers.
  • Verification: Emphasizes running tests and performing visual reviews to ensure the resolution is correct.
  • Use Case: When git rebase or git merge results in conflicts, this skill helps you navigate the process to a clean and functional outcome.

Quick Start

Use the conflict-resolution skill to handle the merge conflicts detected in your current Git operation.

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: conflict-resolution
Download link: https://github.com/troykelly/codex-skills/archive/main.zip#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 471,000+ vetted skills library on demand.