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'
This response does not have an example.

Authorizations

​
Authorization
string
header
required

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.

Required string length: 3 - 128
Example:

"example_id"

​
merge_id
string
required

An ID of a merge attempt

Required string length: 3 - 128
Example:

"example_id"

​
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

A sha1 hexdigest

​
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.

Example:

"repo_id/2aae6c35c94fcfb415dbe95f408b9ce91ee846ed"

​
mode
enum<integer>
required

The file mode (as Unix mode)

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 · file

The body is of type file.

Response

200

Request completed successfully