POST
/
repos
/
{repo_id}
/
merges
/
{merge_id}
/
conflicts
/
{conflict_id}
curl --request POST \
  --url https://api.diversion.dev/v0/repos/{repo_id}/merges/{merge_id}/conflicts/{conflict_id} \
  --header 'Authorization: Bearer <token>' \
  --header 'Content-Type: application/octet-stream' \
  --data '"<string>"'
This response has no body data.

Authorizations

Authorization
string
headerrequired

This API uses OAuth 2 with the implicit grant flow

Path Parameters

repo_id
string
required

The repo ID of the repository. Repo name can be used instead of the ID, but usage of ID for permanent linking and API requests is preferred.

merge_id
string
required

An ID of a merge attempt

conflict_id
string
required

An identifier of a conflict retrieved in conflicts property of GET /repos/{repo_id}/merges/{merge_id}

Query Parameters

size
integer

Blob size in bytes

sha1
string

sha of the contents, to be used in case of async flow

storage_backend
enum<integer>

An optional storage type for async upload.

Available options:
1,
2
storage_uri
string

An optional storage uri to be sent along storage_backend.

mode
enum<integer>
required

Updates the file or tree mode with the given value. Can be used to resolve mode conflicts.

Available options:
16877,
33188,
33261,
40960
path
string

Updates the path of the file with the value passed here. Can be used to resolve path conflicts.

Body

application/octet-stream ยท string

The body is of type string.