Select your cookie preferences

We use essential cookies and similar tools that are necessary to provide our site and services. We use performance cookies to collect anonymous statistics, so we can understand how customers use our site and make improvements. Essential cookies cannot be deactivated, but you can choose “Customize” or “Decline” to decline performance cookies.

If you agree, AWS and approved third parties will also use cookies to provide useful site features, remember your preferences, and display relevant content, including relevant advertising. To accept or decline all non-essential cookies, choose “Accept” or “Decline.” To make more detailed choices, choose “Customize.”

ConflictMetadata - AWS CodeCommit

ConflictMetadata

Information about the metadata for a conflict in a merge operation.

Contents

contentConflict

A boolean value indicating whether there are conflicts in the content of a file.

Type: Boolean

Required: No

fileModeConflict

A boolean value indicating whether there are conflicts in the file mode of a file.

Type: Boolean

Required: No

fileModes

The file modes of the file in the source, destination, and base of the merge.

Type: FileModes object

Required: No

filePath

The path of the file that contains conflicts.

Type: String

Required: No

fileSizes

The file sizes of the file in the source, destination, and base of the merge.

Type: FileSizes object

Required: No

isBinaryFile

A boolean value (true or false) indicating whether the file is binary or textual in the source, destination, and base of the merge.

Type: IsBinaryFile object

Required: No

mergeOperations

Whether an add, modify, or delete operation caused the conflict between the source and destination of the merge.

Type: MergeOperations object

Required: No

numberOfConflicts

The number of conflicts, including both hunk conflicts and metadata conflicts.

Type: Integer

Required: No

objectTypeConflict

A boolean value (true or false) indicating whether there are conflicts between the branches in the object type of a file, folder, or submodule.

Type: Boolean

Required: No

objectTypes

Information about any object type conflicts in a merge operation.

Type: ObjectTypes object

Required: No

See Also

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

PrivacySite termsCookie preferences
© 2025, Amazon Web Services, Inc. or its affiliates. All rights reserved.