POST
/
repos
/
{repo_id}
/
merges
/
{merge_id}
/
conflicts
/
{index_id}

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

index_id
integer
required

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

Response

200 - application/json
conflict_id
string
required
file_mode
integer
file_version
string
object_type
integer
path
string
prev_path
string
type
enum<string>
Available options:
modified,
added,
deleted
Update conflicting fileGet tags list