git_merge
Merge a branch into the current branch with fast-forward-only default, optional merge commit, and abort on conflicts or dirty tree.
Instructions
Merges a branch into the current branch. Fast-forward only unless fast_forward_only is false; refuses a dirty working tree, and aborts a merge that conflicts, leaving the repository unchanged
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo_path | Yes | ||
| source_branch | Yes | Branch, tag or commit to merge into the current branch | |
| fast_forward_only | No | Only fast-forward, failing if the branches have diverged. False allows a merge commit |