Obtaining All Conflict Files

This API is used to obtain all conflict files.

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

GET https://{hostURL}/v4/repositories/{repository_id}/merge-requests/{merge_request_iid}/conflict-files

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

**Table 2** Query Parameters
Parameter	Mandatory	Type	Description
offset	No	Integer	Definition Offset, which starts from 0. Value range: 0~2147483647 Default value: 0
limit	No	Integer	Definition Number of returned records. Value range: 1~100 Default value: 20
hide_content	No	Boolean	Definition If true, file conflict details are hidden. Default value: false

**Table 3** 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.

Status code: 200

**Table 4** Response body parameters
Parameter	Type	Description
[items]	Array of MRConflictFileDto objects	Conflict file details

**Table 5** MRConflictFileDto
Parameter	Type	Description
old_path	String	Definition Old file name.
new_path	String	Definition New file name.
blob_icon	String	blob_icon
blob_path	String	Blob path
conflict_type	String	Conflict type
content	String	Content
content_path	String	Content path
sections	Array of ConflictSectionDto objects	Snippet
type	String	Type
error_message	String	Error message

**Table 6** ConflictSectionDto
Parameter	Type	Description
conflict	Boolean	Whether conflicts exist
lines	Array of ConflictSectionLineDto objects	Conflict line list
id	String	No.

**Table 7** ConflictSectionLineDto
Parameter	Type	Description
line_code	String	Line
type	String	Type
old_line	Integer	Old line
new_line	Integer	New line
text	String	Text
meta_data	ConflictSectionLineMetaDataDto object	Metadata
rich_text	String	Rich text
can_receive_suggestion	Boolean	Acceptable suggestion

**Table 8** ConflictSectionLineMetaDataDto
Parameter	Type	Description
old_pos	Integer	Old column position
new_pos	Integer	New column position

Status code: 401

**Table 9** Response body parameters
Parameter	Type	Description
error_code	String	Definition Error code.
error_msg	String	Definition Error message.

GET https://{endpoint}/v4/repositories/2112015538/merge-requests/1/conflict-files

Status code: 401

Unauthorized

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

Status Code	Description
200	Obtain all conflict files.
401	Unauthorized

Parent topic: MergeRequest

Thank you very much for your feedback. We will continue working to improve the documentation.

The system is busy. Please try again later.