df_merge
Merge a specified branch into the current branch after confirmation. Reports conflicts without aborting, so you can resolve them directly.
Instructions
Mergear una rama en la rama actual. Requiere confirm: true. Si hay conflictos, los reporta sin abortar.
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": "df_merge"
}
}Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| branch | Yes | Nombre de la rama a mergear en la rama actual | |
| confirm | No | true para ejecutar el merge |