resolve_conflict
Analyze and resolve Git conflicts by processing git diff output or conflict file content to restore code functionality.
Instructions
【Git 冲突解决】分析并解决 Git 冲突
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| conflicts | No | 冲突内容（git diff 或冲突文件内容） |
Input Schema (JSON Schema)
{
"properties": {
"conflicts": {
"description": "冲突内容（git diff 或冲突文件内容）",
"type": "string"
}
},
"required": [],
"type": "object"
}