git-merge
Merge a branch into the current branch and detect conflicts to maintain version control integrity.
Instructions
Merge a branch into the current branch with conflict detection
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": {
"branch": "<branch>"
},
"name": "git-merge"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| directory | No | The directory to run the command in (defaults to current working directory) | |
| branch | Yes | The branch to merge into the current branch | |
| strategy | No | Merge strategy (optional): ours, theirs, recursive, etc. |