git-merge
Merge a branch into the current branch and detect conflicts to maintain version control integrity.
Instructions
Merge a branch into the current branch with conflict detection
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| directory | No | The directory to run the command in (defaults to current working directory) | |
| branch | Yes | The branch to merge into the current branch | |
| strategy | No | Merge strategy (optional): ours, theirs, recursive, etc. |