Obtaining Branch Code Conflicts
Function
This API is used to obtain branch code conflicts.
Debugging
You can debug this API through automatic authentication in API Explorer or use the SDK sample code generated by API Explorer.
URI
GET https://{hostURL}/v4/repositories/{repository_id}/merge-requests/conflict
| Parameter | Mandatory | Type | Description |
|---|---|---|---|
| repository_id | Yes | Integer | Definition You can query the project list to obtain the repository ID by calling the API used to query user's all repositories. Constraints N/A. Value range: 1~2147483647 |
| Parameter | Mandatory | Type | Description |
|---|---|---|---|
| source_repository_id | Yes | Integer | Definition Query the specified source repository data. Value range: 1~2147483647 |
| source_branch | Yes | String | Definition Source branch. |
| target_branch | Yes | String | Definition Target branch. |
| target_repository_id | Yes | Integer | Definition Target repository ID. Repository to which the code is to be merged when an MR is created. Value range: 1~2147483647 |
Request Parameters
| Parameter | Mandatory | Type | Description |
|---|---|---|---|
| X-Auth-Token | Yes | String | Definition User token. Obtain a token by calling the IAM API for obtaining a user token. The value of X-Subject-Token in the response header is the user token. Constraints Mandatory. Range 1–100,000 characters. Default Value N/A. |
Response Parameters
Status code: 200
| Parameter | Type | Description |
|---|---|---|
| source_repository_id | Integer | Source repository ID |
| target_repository_id | Integer | Target repository ID |
| source_branch | String | Source branch |
| target_branch | String | Target branch |
| is_conflict | Boolean | Whether conflicts exist |
Status code: 401
| Parameter | Type | Description |
|---|---|---|
| error_code | String | Definition Error code. |
| error_msg | String | Definition Error message. |
Example Requests
None
Example Responses
Status code: 200
OK
{
"source_repository_id" : 9,
"target_repository_id" : 9,
"source_branch" : "dev",
"is_conflict" : true
} Status code: 401
Unauthorized
{
"error_code" : "DEV.00000003",
"error_msg" : "Authentication information expired."
} Status Codes
| Status Code | Description |
|---|---|
| 200 | OK |
| 401 | Unauthorized |
Error Codes
See Error Codes.
Feedback
Was this page helpful?
Provide feedbackThank you very much for your feedback. We will continue working to improve the documentation.