360 Secure SkillHub
360 安全技能中心

Conflict Manager

核心提供两个HTTP接口：/conflict-scan接收requirementId等，返回各仓库/分支对的冲突文件列表；/conflict-resolve接收仓库、分支等解析负载，支持干运行合并及实际合并。典型场景为集成地狱仪表盘调用处理Git多分支冲突，输入为对应请求payload，输出结果数据，同时通过WebSocket发布实时事件供UI响应，需repo:read和repo:write权限。

brajesh9373
brajesh9373
热度 22.41
最近更新 2026-05-20 03:37:05
分类：开发依赖：代码执行 / 第三方 API应用场景：DevOps / API 集成 / 自动化脚本

安装技能

复制下面的话术发给你的 Agent，它会通过 secure-skills 检索并安装该技能。

执行命令安装此 skill： npx secure-skills-cli add conflict-manager
Metadata
name
conflict-manager
description
Provides HTTP endpoints for scanning Git repository conflicts across multiple branches and applying AI‑suggested resolutions. Use when the dashboard needs to request a conflict scan (`/conflict-scan`) or apply a resolution (`/conflict-resolve`). This skill talks to the OpenClaw Gateway and publishes WebSocket events (`conflictScanResult`, `resolutionSuggestion`, `resolutionApplied`).

Conflict Manager Skill

Overview

This skill implements two public HTTP APIs that the Integration‑Hell‑Dashboard can call:

  1. POST /conflict-scan – Accepts a requirementId (or any custom payload) and returns a list of conflicted files per repository/branch pair.
  2. POST /conflict-resolve – Accepts a resolution payload (repo, source/target branches, optional patch or command list) and attempts a dry‑run merge followed by the actual merge if dryRun is false.

Both endpoints publish WebSocket events so the UI can react in real‑time.

Permissions

  • repo:read – required to list branches and fetch commits.
  • repo:write – required to perform merges and push changes.

Resources

  • scripts/index.js – Core implementation of the two endpoints.

The skill is intentionally minimal; you can extend it with proper Git operations, authentication handling, and smarter AI integration later.