AWS CodeCommit
API Reference (API Version 2015-04-13)

Conflict

Information about conflicts in a merge operation.

Contents

conflictMetadata

Metadata about a conflict in a merge operation.

Type: ConflictMetadata object

Required: No

mergeHunks

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 AWS SDKs, see the following:

On this page: