POST
/
repos
/
{repo_id}
/
merges
/
{merge_id}
/
conflicts
/
{conflict_id}
/
accept
curl --request POST \
  --url https://api.diversion.dev/v0/repos/{repo_id}/merges/{merge_id}/conflicts/{conflict_id}/accept \
  --header 'Authorization: Bearer <token>'

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

index_id
string
required

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