conflict-resolver
OfficialSafely resolve Git conflicts one file at a time.
Authoreinja-inc
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill helps developers resolve git conflicts efficiently by guiding per-file decisions during rebase, merge, stash, or cherry-pick operations.
Core Features & Use Cases
- Per-file conflict resolution with guided prompts
- Detect conflict type and present safe options before applying changes
- Integrates with common workflows to reduce manual merge toil, especially in collaborative projects
Quick Start
Run the conflict-resolver on a repository with active conflicts and follow the prompts to resolve each file one by one, then stage and commit the results.
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: conflict-resolver Download link: https://github.com/einja-inc/einja-management-template/archive/main.zip#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 471,000+ vetted skills library on demand.