merge_branches
Merge branches with automatic conflict detection: auto-merge when only one side changed, create conflict question when both sides modify same fact differently for author resolution.
Instructions
[branch] src ブランチを dst へ統合(3-way)。片側のみ変更した事実は自動統合。 両側が同一事実を別の値にした箇所は競合として作者質問(MERGE_CONFLICT)を生成する。 競合は answer_question で正史を決める。
Tool call template
Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.
{
"id": 1,
"jsonrpc": "2.0",
"method": "tools/call",
"params": {
"arguments": {
"src": "<src>",
"dst": "<dst>"
},
"name": "merge_branches"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| dst | Yes | ||
| src | Yes |