Repository Merge Manipulation
Update a conflicting file, potentially resolving the conflict.
POST
/
repos
/
{repo_id}
/
merges
/
{merge_id}
/
conflicts
/
{conflict_id}
Authorizations
This API uses OAuth 2 with the implicit grant flow
Path Parameters
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
An ID of a merge attempt
Required string length:
3 - 128
An identifier of a conflict retrieved in conflicts property of GET /repos/{repo_id}/merges/{merge_id}
Query Parameters
Blob size in bytes
A sha1 hexdigest
An optional storage type for async upload.
Available options:
1
, 2
An optional storage uri to be sent along storage_backend.
The file mode (as Unix mode)
Available options:
16877
, 33188
, 33261
, 40960
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
.