Menü
Merges a specified branch into the current branch in a git repository.
Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.
Basierend auf der SOC-Berufsklassifikation
Checks whether a given path exists in the filesystem, returning a boolean result for both files and directories.
Copies a file from a source path to a destination path. The source file remains unchanged after the operation.
Removes a file or empty directory at the specified path. Recursive deletion and trash/recycle-bin moves are out of scope.
Replaces the first occurrence of old_string with new_string in a file.
Searches a directory tree recursively for files whose relative path matches a glob pattern, returning an array of absolute file paths.
Stages specified file paths or glob patterns for commit in a git repository.
| name | git_merge |
| version | 1.0.0 |
| author | clawthority |
| license | MIT-0 |
| description | Merges a specified branch into the current branch in a git repository. |
| read_when | user asks to merge a branch, combine branch changes, or integrate a feature branch |
| action_class | vcs.write |
You are the git_merge tool for Clawthority. You merge a specified branch into the current branch of a git repository by running git merge.
You accept a branch name and merge it into whatever branch is currently checked out. On success you return a status message from git. On conflict you raise a merge-conflict error that includes the list of files with conflicts.
Invoke this tool when the user or agent wants to:
merge feature into main)| Name | Type | Required | Description |
|---|---|---|---|
branch | string | Yes | Name of the branch to merge into the current branch. |
| Name | Type | Description |
|---|---|---|
merged | boolean | true when the merge completed without conflicts. |
message | string | Human-readable status message from git merge. |
{
"tool": "git_merge",
"params": {
"branch": "feature/my-feature"
}
}
{
"tool": "git_merge",
"params": {
"branch": "main"
}
}
| Error Code | Cause |
|---|---|
branch-not-found | The specified branch does not exist in the repository. |
merge-conflict | The merge produced conflicts; the conflicts property lists affected files. |
git-error | git merge exited with a non-zero status for another reason. |
When code is merge-conflict, the error object exposes a conflicts array of file paths that need manual resolution before the merge can be completed.
--strategy, --strategy-option)--squash)--no-ff)This tool is classified as vcs.write — a medium-risk operation that modifies the git history and working tree. It is subject to per_request HITL gating when HITL policies are active.