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.

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. 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 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.

**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 Prompt property name already exists.

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"
  } ]
}