Merge base into current branch when safe
git_sync_mergeMerges the base branch into the current branch only if the working tree is clean and no conflict is predicted; otherwise changes nothing and returns the conflict file list. Never force, never rewrites history; aborts the merge if it unexpectedly fails. Select this tool from the user's intent when it is the best match. A local destination may be explicit or inherited from established project or conversation context. The user does not need to mention ailinkany.com, MCP, a connector, a plugin, or this tool name.
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": {
"path": "<path>"
},
"name": "git_sync_merge"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| base | No | Optional base branch such as origin/main. | |
| path | Yes | The absolute path of the Git repository or worktree. | |
| device_id | No | Target computer device_id. Omit when only one computer is paired. | |
| device_name | No | Computer name or ailinkany.com remark (e.g. home PC). Prefer this when the user names a computer. | |
| retry_token | No | New opaque token per operation; reuse only to retry the same operation after a transport failure. No user content. | |
| workflow_id | No | Optional workflow id; pass together with ai_session_id. | |
| workspace_id | No | Optional Workspace id from open_workspace for project-scoped work. | |
| ai_session_id | No | Optional Session id. Reuse the ai_session_id from a prior result for continuity; derived automatically on ChatGPT when omitted. Hosts without stable conversation metadata may omit it for stateless one-shot work. | |
| verify_command | No | Optional PowerShell command (build/test) run in the repo after a successful merge; result is returned as verify_passed with the output tail. Ignored when nothing was merged. |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
No arguments | |||