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": {
"id": "<string>",
"image": "<string>",
"email": "[email protected]",
"full_name": "<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>",
"type": 1,
"prev_path": "<string>"
},
"other": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"type": 1,
"prev_path": "<string>"
},
"result": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"type": 1,
"prev_path": "<string>"
}
}
]
}Retrieves detailed information about a specific open merge including all conflicts with their base, other, and result indices. Each conflict shows file paths, modes, sizes, storage locations, and resolution status. Returns 404 Not Found if the merge doesn’t exist, or 405 Method Not Allowed if the merge is obsolete.
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": {
"id": "<string>",
"image": "<string>",
"email": "[email protected]",
"full_name": "<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>",
"type": 1,
"prev_path": "<string>"
},
"other": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"type": 1,
"prev_path": "<string>"
},
"result": {
"conflict_index_id": "RESULT",
"file_mode": 16877,
"path": "<string>",
"type": 1,
"prev_path": "<string>"
}
}
]
}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
Show child attributes
A index in a conflict, could be representing either "base", "other" or "result". If the index does not represent "result", then all properties besides "prev_path" can be considered 'required'.
Show child attributes
RESULT, BASE, OTHER The file mode (as Unix mode)
16877, 33188, 33261, 40960 One of: 1 - INTACT, 2 - ADDED, 3 - MODIFIED, 4 - DELETED
1, 2, 3, 4 A index in a conflict, could be representing either "base", "other" or "result". If the index does not represent "result", then all properties besides "prev_path" can be considered 'required'.
Show child attributes
RESULT, BASE, OTHER The file mode (as Unix mode)
16877, 33188, 33261, 40960 One of: 1 - INTACT, 2 - ADDED, 3 - MODIFIED, 4 - DELETED
1, 2, 3, 4 A index in a conflict, could be representing either "base", "other" or "result". If the index does not represent "result", then all properties besides "prev_path" can be considered 'required'.
Show child attributes
RESULT, BASE, OTHER The file mode (as Unix mode)
16877, 33188, 33261, 40960 One of: 1 - INTACT, 2 - ADDED, 3 - MODIFIED, 4 - DELETED
1, 2, 3, 4