Save versioned conflict resolutions

Owner/Admin. Select source or target; custom results are limited to values, names, definitions and language configuration. Saves choices and queues validation. Failed validation retains the choices. Never reuse decisions on a new preview.

PATCH /api/v1/workspaces/{workspaceId}/projects/{projectId}/branch-comparisons/{id}/resolutions

Operation: resolveBranchConflicts · Download OpenAPI

Access

This operation does not use the panel session as its authentication mechanism. Follow the operation-specific checks described above.

session

{
  "type": "apiKey",
  "in": "cookie",
  "name": "__Host-localisync-session"
}

Parameters

Name	Location	Required	Description
`workspaceId`	path	Yes	See constraints below.
`projectId`	path	Yes	See constraints below.
`id`	path	Yes	See constraints below.
`Origin`	header	Yes	See constraints below.
`X-CSRF-Token`	header	Yes	See constraints below.

workspaceId

{
  "type": "string",
  "format": "uuid"
}

projectId

{
  "type": "string",
  "format": "uuid"
}

id

{
  "type": "string",
  "format": "uuid"
}

Origin

{
  "type": "string",
  "format": "uri"
}

X-CSRF-Token

{
  "type": "string"
}

Request body

Required: Yes.

application/json

Schema reference: Resolve.

Field	Type	Required	Constraints / description
`version`	integer	Yes	minimum: `1`; maximum: `2147483646`
`resolutions`	Array of See schema	Yes	minItems: `1`; maxItems: `100`

{
  "$ref": "#/components/schemas/Resolve"
}

Responses

202

Operation queued; poll its state.

Response headers:

{
  "Cache-Control": {
    "schema": {
      "type": "string",
      "const": "no-store"
    }
  }
}

Content type: application/json Schema reference: BranchJob.

Field	Type	Required	Constraints / description
`id`	string	Yes	format: `"uuid"`
`workspaceId`	string	Yes	format: `"uuid"`
`projectId`	string	Yes	format: `"uuid"`
`kind`	`fork`, `compare`, `merge`, `delete`	Yes	—
`state`	`queued`, `processing`, `ready`, `completed`, `failed`, `conflict`, `cancelled`, `expired`	Yes	—
`version`	integer	Yes	minimum: `1`; maximum: `2147483646`
`summary`	object	Yes	—
`resultBranchId`	See schema	Yes	—
`appliedJobId`	See schema	Yes	—
`errorCode`	See schema	Yes	—
`createdAt`	string	Yes	format: `"date-time"`
`expiresAt`	string	Yes	format: `"date-time"`
`sourceBranchId`	See schema	Yes	—
`targetBranchId`	See schema	Yes	—
`actorId`	string	Yes	format: `"uuid"`

{
  "$ref": "#/components/schemas/BranchJob"
}