f2s-kb-merge

Community

Resolve editor context conflicts after Git merges

AuthorLands-1203
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill addresses the issue of context conflicts that arise after Git merges, allowing for a streamlined resolution process without manual intervention.

Core Features & Use Cases

  • Merge Conflict Resolution: Automatically merges AI and developer context-related files after a merge, ensuring alignment of indexes, rules, skills, and documentation.
  • Conflict Scanning and Classification: Provides a detailed scan of conflict files and categorizes them for user review.
  • User Confirmation Required: For critical conflicts involving executable code or deployment-related changes, the Skill presents the differences and recommendations to the user for final confirmation.

Quick Start

Run the f2s-kb-merge skill to automatically resolve context conflicts after a Git merge.

Dependency Matrix

Required Modules

None required

Components

scriptsreferences

💻 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: f2s-kb-merge
Download link: https://github.com/Lands-1203/Flow2Spec/archive/main.zip#f2s-kb-merge

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 620,000+ vetted skills library on demand.