git-conflict-resolver
CommunitySafely resolve git merge conflicts with confidence.
Software Engineering#git#rebase#conflict-resolution#version-control#merge-conflicts#conflict-markers
Authorgirijashankarj
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Safely resolve git merge conflicts by understanding both sides, choosing the correct resolution, and validating the result.
Core Features & Use Cases
- Classify conflicts by type (trivial, additive, competing, structural, delete-vs-edit, semantic) and apply the appropriate resolution strategy.
- Step-by-step workflow to assess, understand, resolve, validate, and finalize merges or rebases with guardrails.
- Use cases include resolving in-progress merges, rebases, and cherry-picks with minimal disruption and clear auditing.
Quick Start
Guide me through resolving the current merge conflict step by step.
Dependency Matrix
Required Modules
None requiredComponents
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: git-conflict-resolver Download link: https://github.com/girijashankarj/cursor-handbook/archive/main.zip#git-conflict-resolver Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 510,000+ vetted skills library on demand.