Git

Resolve selected source conflicts

Apply complete file contents, explicit deletions, or verified pinned sides. Continue the native merge. Do not commit or deploy.

post/v1/spaces/{spaceId}/source/workspaces/{workspaceId}/resolve-conflicts

Request

  • Base URL: https://api.spacefast.com
  • URL: https://api.spacefast.com/v1/spaces/{spaceId}/source/workspaces/{workspaceId}/resolve-conflicts
  • Auth: one of:
    • HTTP bearer
    • OAuth 2 (authorization code, authorization URL https://api.spacefast.com/v1/auth/oauth2/authorize, token URL https://api.spacefast.com/v1/auth/oauth2/token; client credentials, token URL https://api.spacefast.com/v1/auth/oauth2/token, scopes: spaces:write, spaces:read)

Path parameters

spaceIdstring required
workspaceIdstring required

Request body

expectedRevisioninteger required

Revision from the last workspace response. Read the workspace again after a revision conflict.

operationIdstring required

Unique ID for this operation. Reuse this ID and the same input after an uncertain response.

Response

Response for status 200

$schemastring uri

Canonical JSON Schema URL for this response body. The server also sends it in the Link: rel="describedby" response header.

Changes

No recorded changes to this operation across all 1 revision of this API.