Help Center/ CodeArts Repo/ API Reference/ APIs/ V4/ MergeRequest/ Resolving Merge Request Conflicts Online
Updated on 2026-01-27 GMT+08:00
View PDF
Share

Resolving Merge Request Conflicts Online

Function

This API is used to resolve merge request conflicts online.

Debugging

You can debug this API through automatic authentication in API Explorer or use the SDK sample code generated by API Explorer.

Authorization Information

Each account root user has all the permissions required to call all APIs, but IAM users must be assigned the following required identity policy-based permissions. For details about the required permissions, see Permissions Policies and Supported Actions.

Action

Access Level

Resource Type (*: required)

Condition Key

Alias

Dependencies

codeartsrepo:repository:updateMergeRequest

Write

-

-

-

-

URI

PUT https://{hostURL}/v4/repositories/{repository_id}/merge-requests/{merge_request_iid}/resolve-conflicts

Table 1 Path Parameters

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

Default Value

N/A

Value range:

1~2147483647

merge_request_iid

Yes

Integer

Definition

MR internal ID (IID).

Value range:

1~2147483647

Request Parameters

Table 2 Request header parameters

Parameter

Mandatory

Type

Description

X-Auth-Token

Yes

String

Definition

User token. Obtain one by calling the IAM API Obtaining a User Token. The value of X-Subject-Token in the response header is a token.

Constraints

N/A

Range

1–100,000 characters.

Default Value

N/A
Table 3 Request body parameters

Parameter

Mandatory

Type

Description

commit_message

Yes

String

Definition

Commit message.

files

Yes

Array of ResolveConflictFileDto objects

Definition

Conflict file.
Table 4 ResolveConflictFileDto

Parameter

Mandatory

Type

Description

old_path

Yes

String

Definition

Old file path.

new_path

Yes

String

Definition

New file path.

sections

No

Object

Definition

Required only when selecting the option of accepting different branches.

content

No

String

Definition

File content and is required only when editing a conflict file online.

Response Parameters

Status code: 200

Table 5 Response body parameters

Parameter

Type

Description

message

String

Definition

Conflict resolution result.

Status code: 401

Table 6 Response body parameters

Parameter

Type

Description

error_code

String

Definition

Error code.

error_msg

String

Definition

Error message.

Status code: 403

Table 7 Response body parameters

Parameter

Type

Description

error_code

String

Definition

Error code.

error_msg

String

Definition

Error message.

Example Requests

PUT https://{endpoint}/v4/repositories/12344/merge-requests/1/resolve-conflicts

{
  "commit_message" : "Resolve the conflicts online.",
  "files" : [ {
    "old_path" : "/dir/file1",
    "new_path" : "/dir/file2",
    "content" : "111"
  } ]
}

Example Responses

Status code: 200

Resolve merge request conflicts online.

{
  "message" : "success"
}

Status code: 401

Unauthenticated.

{
  "error_code" : "DEV.00000003",
  "error_msg" : "Authentication information expired."
}

Status code: 403

Insufficient permissions.

{
  "error_code" : "CH.004403",
  "error_msg" : "Insufficient permissions. Apply for the required permissions and try again."
}

Status Codes

Status Code

Description

200

Resolve merge request conflicts online.

401

Unauthenticated.

403

Insufficient permissions.

Error Codes

See Error Codes.

Parent topic: MergeRequest