curl --request GET \
--url https://api.diversion.dev/v0/repos/{repo_id}/merges/{merge_id} \
--header 'Authorization: Bearer <token>'
{
"id": "<string>",
"repo_id": "<string>",
"user": {
"image": "<string>",
"email": "jsmith@example.com",
"full_name": "<string>",
"id": "<string>",
"name": "<string>"
},
"base_ref": "<string>",
"base_commit": "<string>",
"other_ref": "<string>",
"other_commit": "<string>",
"ancestor_commit": "<string>",
"conflicts": [
{
"conflict_id": "<string>",
"is_resolved": true,
"base": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"prev_path": "<string>",
"type": 1
},
"other": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"prev_path": "<string>",
"type": 1
},
"result": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"prev_path": "<string>",
"type": 1
}
}
]
}
curl --request GET \
--url https://api.diversion.dev/v0/repos/{repo_id}/merges/{merge_id} \
--header 'Authorization: Bearer <token>'
{
"id": "<string>",
"repo_id": "<string>",
"user": {
"image": "<string>",
"email": "jsmith@example.com",
"full_name": "<string>",
"id": "<string>",
"name": "<string>"
},
"base_ref": "<string>",
"base_commit": "<string>",
"other_ref": "<string>",
"other_commit": "<string>",
"ancestor_commit": "<string>",
"conflicts": [
{
"conflict_id": "<string>",
"is_resolved": true,
"base": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"prev_path": "<string>",
"type": 1
},
"other": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"prev_path": "<string>",
"type": 1
},
"result": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"prev_path": "<string>",
"type": 1
}
}
]
}
This API uses OAuth 2 with the implicit grant flow
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.
3 - 128
"example_id"
An ID of a merge attempt
3 - 128
"example_id"
An object describing the merge.
Describes a merge in progress with conflicts