Repository Merge Manipulation
Update a conflicting file, potentially resolving the conflict.
POST
/
repos
/
{repo_id}
/
merges
/
{merge_id}
/
conflicts
/
{conflict_id}
Authorizations
Authorization
string
headerrequiredThis API uses OAuth 2 with the implicit grant flow
Path Parameters
repo_id
string
requiredThe 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
requiredAn ID of a merge attempt
conflict_id
string
requiredAn 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.
mode
enum<integer>
requiredThe 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
.