git_merge
Merge a branch into your current working branch to integrate changes from development work. Supports merge commits and abort options for version control management.
Instructions
Merge a branch into current branch
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| branch | Yes | Branch to merge into current branch | |
| cwd | No | Repository directory | |
| noFf | No | Create merge commit even if fast-forward is possible | |
| abort | No | Abort current merge |
Input Schema (JSON Schema)
{
"properties": {
"abort": {
"default": false,
"description": "Abort current merge",
"type": "boolean"
},
"branch": {
"description": "Branch to merge into current branch",
"type": "string"
},
"cwd": {
"description": "Repository directory",
"type": "string"
},
"noFf": {
"default": false,
"description": "Create merge commit even if fast-forward is possible",
"type": "boolean"
}
},
"required": [
"branch"
],
"type": "object"
}