class Aws::CodeCommit::Types::ConflictMetadata


@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ConflictMetadata AWS API Documentation
@return [Types::MergeOperations]
between the source and destination of the merge.
Whether an add, modify, or delete operation caused the conflict
@!attribute [rw] merge_operations
@return [Boolean]
or submodule.
conflicts between the branches in the object type of a file, folder,
A boolean value (true or false) indicating whether there are
@!attribute [rw] object_type_conflict
@return [Boolean]
mode of a file.
A boolean value indicating whether there are conflicts in the file
@!attribute [rw] file_mode_conflict
@return [Boolean]
content of a file.
A boolean value indicating whether there are conflicts in the
@!attribute [rw] content_conflict
@return [Types::IsBinaryFile]
binary or textual in the source, destination, and base of the merge.
A boolean value (true or false) indicating whether the file is
@!attribute [rw] is_binary_file
@return [Integer]
conflicts.
The number of conflicts, including both hunk conflicts and metadata
@!attribute [rw] number_of_conflicts
@return [Types::ObjectTypes]
Information about any object type conflicts in a merge operation.
@!attribute [rw] object_types
@return [Types::FileModes]
the merge.
The file modes of the file in the source, destination, and base of
@!attribute [rw] file_modes
@return [Types::FileSizes]
the merge.
The file sizes of the file in the source, destination, and base of
@!attribute [rw] file_sizes
@return [String]
The path of the file that contains conflicts.
@!attribute [rw] file_path
Information about the metadata for a conflict in a merge operation.