Git Merge
git_mergeIntegrate changes from another branch into your current Git branch. Configure merge strategies, squash commits, write custom messages, or abort conflicting merges.
Instructions
Merge branches together. Integrates changes from another branch into the current branch with optional merge strategies.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| path | No | Path to the Git repository. Defaults to session working directory set via git_set_working_dir. | . |
| branch | Yes | Branch to merge into current branch. | |
| strategy | No | Merge strategy to use (ort, recursive, octopus, ours, subtree). | |
| noFastForward | No | Prevent fast-forward merge (create merge commit). | |
| squash | No | Squash all commits from the branch into a single commit. | |
| message | No | Custom merge commit message. | |
| abort | No | Abort an in-progress merge that has conflicts. |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| success | Yes | Indicates if the operation was successful. | |
| strategy | Yes | Merge strategy used. | |
| fastForward | Yes | Whether merge was fast-forward. | |
| conflicts | Yes | Whether merge had conflicts. | |
| conflictedFiles | Yes | Files with conflicts that need resolution. | |
| mergedFiles | Yes | Files that were merged. | |
| message | Yes | Merge commit message. |