1natsu-pair-resolve-conflicts
CommunityHuman-in-the-loop pair conflict resolution.
Software Engineering#git#workflow#collaboration#code-review#conflicts#pair-programming#merge-conflict
Author1natsu172
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Git conflict resolution can be error-prone and tedious; this Skill guides a human through each conflict with AI-assisted analysis and explanations, ensuring approvals before applying changes.
Core Features & Use Cases
- Collaborative analysis of conflicting changes across commits, explaining intent and trade-offs.
- Phase-based workflow (status check, overview, per-file resolution, finalization) to keep humans in control.
- Safety-first: never auto-commit; all resolutions require explicit human confirmation and review.
Quick Start
Say "let's resolve conflicts" to enter pair-resolve mode and follow on-screen prompts.
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: 1natsu-pair-resolve-conflicts Download link: https://github.com/1natsu172/dotfiles/archive/main.zip#1natsu-pair-resolve-conflicts 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.