Git Conflict Resolver / Git 冲突解决助手

SKILL.md

---
name: git-conflict-resolver
description: "Automatically resolve Git merge conflicts with smart diff analysis. / 智能分析 Git 合并冲突，一键解决，告别手动对比。"
version: 1.0.0
topics: [git,devops,merge,conflict,开发,版本控制]
metadata:
  openclaw:
    requires:
      bins:
        - bash
        - curl
    emoji: "🔄"
    homepage: https://kingai.work/
    install: []
---

# 🔄 Git Conflict Resolver / Git 冲突解决助手

> Automatically resolve Git merge conflicts with smart diff analysis. / 智能分析 Git 合并冲突，一键解决，告别手动对比。

> 🦁 **由 KingAI.Work 出品** — 智能进化｜vip@kingai.work

---

## Quick Start / 快速开始

```bash
git merge feature-branch && git-conflict-resolve --auto Resolves all detected merge conflicts in the current branch automatically, then stages the resolved files. / 自动解决当前分支中所有检测到的合并冲突，并将解决后的文件暂存，无需手动处理每个冲突。 
```

## Features / 功能

• Automatically detects and analyzes merge conflicts in real-time / 实时自动检测并深度分析合并冲突，精准定位问题源头
• Provides three-way diff visualization for clear conflict understanding / 提供三方差异可视化视图，让冲突原因一目了然，大幅提升解决效率
• Smart resolution suggestions based on code semantics and history / 基于代码语义与提交历史，智能推荐最合理的合并方案
• Handles complex overlapping changes with minimal manual intervention / 高效处理复杂重叠变更，减少人工介入，让合并流程更顺畅
• Batch resolve multiple conflicts across files with a single command / 一键批量处理跨文件的多个冲突，Pro 用户独享批量合并引擎
• Learns from your resolution patterns to offer personalized suggestions / 学习您的解决模式，提供个性化合并建议，Pro 版本解锁全周期学习模型

## Common Use Cases / 常见场景

• You're merging a long-lived feature branch with dozens of conflicts across multiple files. / 您正在合并一个长期开发的功能分支，发现数十个跨文件冲突，手动处理耗时且易出错。Git Conflict Resolver 瞬间分析并批量解决，节省数小时。
• A junior developer pushes a conflicting change to a shared branch during a team sprint. / 团队冲刺期间，一名初级开发者在共享分支上推送了冲突变更。Git Conflict Resolver 自动分析并提供安全合并建议，避免代码仓库混乱。
• You need to resolve conflicts in a configuration file where multiple developers changed different sections. / 多个开发者同时修改了配置文件的各个部分，导致复杂冲突。Git Conflict Resolver 的三方对比视图帮助您快速区分变更，轻松合并。

## Compare / 对比

| | Free | Pro |
|---|:----:|:---:|
| Basic | ✅ | ✅ |
| Advanced | — | ✅ |
| AI | — | ✅ |
| Support | Community | Priority |

• Unlock batch resolution for unlimited files across all branches
• 解锁无限文件、全分支的批量冲突解决能力，告别逐个处理的繁琐
• Gain access to the personalized learning engine that adapts to your coding style
• 获得个性化学习引擎，自动适应您的代码习惯，建议更精准
• Enable priority support and conflict history analysis for complex merge scenarios
• 开启优先支持与冲突历史深度分析，轻松驾驭最复杂的合场景\n\n
---
### About the Publisher

Published by King AI — [kingai.work](https://kingai.work/) | vip@kingai.work