POST

/api/v1/team/conflicts/resolve

Resolve a displayed synchronization conflict

Request#

POSIX shell · curl

curl --fail-with-body --request POST \
  "$ADBR_API_URL/api/v1/team/conflicts/resolve" \
  -H "Authorization: Bearer $ADBR_API_TOKEN" \
  -H "Content-Type: application/json" \
  --data @request.json

Use the local address and token from API & MCP. Replace path placeholders such as {id} with actual IDs. Create request.json according to the body schema below before running this command.

Authentication and permissions#

Authentication: Bearer token

Scopes: admin

All listed scopes are required; admin satisfies scope checks. Account permissions, request content, vault state and resource permissions can impose additional requirements.

Parameters#

No path or query parameters declared.

Request body#

Required.

Field	Type	Required
`token`	`string`	Yes
`choice`	`union`	Yes
`selections`	`object`	No

Complete body schema

OpenAPI JSON

{
  "required": true,
  "content": {
    "application/json": {
      "schema": {
        "type": "object",
        "required": [
          "token",
          "choice"
        ],
        "properties": {
          "token": {
            "type": "string",
            "minLength": 64,
            "maxLength": 64
          },
          "choice": {
            "anyOf": [
              {
                "type": "string",
                "enum": [
                  "local"
                ]
              },
              {
                "type": "string",
                "enum": [
                  "cloud"
                ]
              },
              {
                "type": "string",
                "enum": [
                  "merge"
                ]
              }
            ]
          },
          "selections": {
            "type": "object",
            "maxProperties": 1000,
            "additionalProperties": {
              "anyOf": [
                {
                  "type": "string",
                  "enum": [
                    "local"
                  ]
                },
                {
                  "type": "string",
                  "enum": [
                    "cloud"
                  ]
                }
              ]
            }
          }
        },
        "additionalProperties": false
      }
    }
  }
}

Responses#

200 · Default response

OpenAPI JSON

{
  "description": "Default Response",
  "content": {
    "application/json": {
      "schema": {
        "type": "object",
        "required": [
          "ok"
        ],
        "properties": {
          "ok": {
            "type": "boolean",
            "enum": [
              true
            ]
          }
        }
      }
    }
  }
}

default · HTTP error envelope. The status and error.code identify the failure.

OpenAPI JSON

{
  "description": "HTTP error envelope. The status and error.code identify the failure.",
  "content": {
    "application/json": {
      "schema": {
        "$ref": "#/components/schemas/Error"
      }
    }
  }
}

General authentication and transport errors may occur in addition to the documented responses.

OpenAPI definition#

Complete operation definition

OpenAPI JSON

{
  "summary": "Angezeigten Synchronisierungskonflikt auflösen",
  "tags": [
    "Team"
  ],
  "requestBody": {
    "required": true,
    "content": {
      "application/json": {
        "schema": {
          "type": "object",
          "required": [
            "token",
            "choice"
          ],
          "properties": {
            "token": {
              "type": "string",
              "minLength": 64,
              "maxLength": 64
            },
            "choice": {
              "anyOf": [
                {
                  "type": "string",
                  "enum": [
                    "local"
                  ]
                },
                {
                  "type": "string",
                  "enum": [
                    "cloud"
                  ]
                },
                {
                  "type": "string",
                  "enum": [
                    "merge"
                  ]
                }
              ]
            },
            "selections": {
              "type": "object",
              "maxProperties": 1000,
              "additionalProperties": {
                "anyOf": [
                  {
                    "type": "string",
                    "enum": [
                      "local"
                    ]
                  },
                  {
                    "type": "string",
                    "enum": [
                      "cloud"
                    ]
                  }
                ]
              }
            }
          },
          "additionalProperties": false
        }
      }
    }
  },
  "x-required-scopes": [
    "admin"
  ],
  "responses": {
    "200": {
      "description": "Default Response",
      "content": {
        "application/json": {
          "schema": {
            "type": "object",
            "required": [
              "ok"
            ],
            "properties": {
              "ok": {
                "type": "boolean",
                "enum": [
                  true
                ]
              }
            }
          }
        }
      }
    },
    "default": {
      "description": "HTTP error envelope. The status and error.code identify the failure.",
      "content": {
        "application/json": {
          "schema": {
            "$ref": "#/components/schemas/Error"
          }
        }
      }
    }
  }
}