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