GET
/
api
/
repos
/
{namespace}
/
{repo_name}
/
merge
/
{basehead}
curl --request GET \
  --url https://hub.oxen.ai/api/repos/{namespace}/{repo_name}/merge/{basehead} \
  --header 'Authorization: Bearer <token>' \
  --header 'Content-Type: text/plain'
{
  "commits": [
    {
      "author": "ben",
      "email": "b@oxen.ai",
      "id": "ee5980555e5ca956",
      "message": "conflict form b1",
      "parent_ids": [
        "e439bfe5e688e34f"
      ],
      "root_hash": "5db541b3ad28a714b13c80eb0bb321e9",
      "timestamp": "2024-02-28T20:39:34.001149Z"
    }
  ],
  "conflicts": [
    {
      "path": "hi.txt"
    }
  ],
  "is_mergeable": false,
  "oxen_version": "0.11.0",
  "status": "success",
  "status_message": "resource_found"
}

Authorizations

​
Authorization
string
header
required

Bearer authentication header of the form Bearer <token>, where <token> is your auth token.

Headers

​
user-agent
string
Example:

"Oxen/0.10.0"

Path Parameters

​
namespace
string
required
Example:

"7857dd05-601f-44a3-8c12-68de9c92dae1"

​
repo_name
string
required
Example:

"e35fad8a-a942-4450-a363-30c19326a0fd"

​
basehead
string
required
Example:

"b2..b1"

Body

text/plain · file

The body is of type file.

Response

200 - application/json
Conflicts exist
​
commits
object[]
Example:
[
  {
    "author": "ben",
    "email": "b@oxen.ai",
    "id": "ee5980555e5ca956",
    "message": "conflict form b1",
    "parent_ids": ["e439bfe5e688e34f"],
    "root_hash": "5db541b3ad28a714b13c80eb0bb321e9",
    "timestamp": "2024-02-28T20:39:34.001149Z"
  }
]
​
conflicts
object[]
Example:
[{ "path": "hi.txt" }]
​
is_mergeable
boolean
Example:

false

​
oxen_version
string
Example:

"0.11.0"

​
status
string
Example:

"success"

​
status_message
string
Example:

"resource_found"

Diff entries in dirMerge commits or branches