v1

latestSwagger 2.02026-07-175445133.1 KB

git

Check merge conflicts

Checks if merging a worktree to main would cause conflicts

get/v1/git/worktrees/{id}/merge/check

Path parameters

idstring required

Worktree ID

Response

conflict_filesstring[]

List of files with conflicts

has_conflictsboolean

Whether conflicts were detected

messagestring

Status message

operationstring

Operation type (sync/merge)

worktree_namestring

Name of the worktree

Example response

{
  "conflict_files": [
    "[\"src/main.go\"",
    " \"README.md\"]"
  ],
  "has_conflicts": true,
  "message": "No conflicts detected",
  "operation": "sync",
  "worktree_name": "feature-branch"
}