Conflict - Amazon CodeCommit
Services or capabilities described in Amazon Web Services documentation might vary by Region. To see the differences applicable to the China Regions, see Getting Started with Amazon Web Services in China (PDF).


Information about conflicts in a merge operation.



Metadata about a conflict in a merge operation.

Type: ConflictMetadata object

Required: No


A list of hunks that contain the differences between files or lines causing the conflict.

Type: Array of MergeHunk objects

Required: No

See Also

For more information about using this API in one of the language-specific Amazon SDKs, see the following: