kf-conflict-resolver
OfficialSafely resolve git merge conflicts.
Software Engineering#automation#git#workflow#conflict-resolution#version-control#development-tools#merge-conflicts
AuthorKiloforge
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Resolve git merge conflicts that arise during push or pull sync operations by fetching remote changes, merging, resolving conflicts intelligently, and escalating when conflicts are ambiguous or high-risk.
Core Features & Use Cases
- Automated conflict resolution for text-based source files with deterministic merging strategies
- Escalation to a user when conflicts are ambiguous or high-risk
- Completion of the sync after a successful merge, with clear reporting
Quick Start
Invoke the command /kf-conflict-resolver push main to start resolving conflicts during a push operation.
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: kf-conflict-resolver Download link: https://github.com/Kiloforge/kiloforge-skills/archive/main.zip#kf-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.