check_for_conflicts
Checks if a repository has merge conflicts with its upstream base branch, enabling proactive conflict resolution before merging.
Instructions
Check if there are merge conflicts with upstream.
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": {
"repo_path": "<repo_path>"
},
"name": "check_for_conflicts"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo_path | Yes | ||
| base | No | main |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
No arguments | |||