You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.

Class: Aws::CodeCommit::Types::ConflictMetadata

Inherits:
Struct
  • Object
show all
Defined in:
(unknown)

Overview

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

Returned by:

Instance Attribute Summary collapse

Instance Attribute Details

#content_conflictBoolean

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

Returns:

  • (Boolean)

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

#file_mode_conflictBoolean

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

Returns:

  • (Boolean)

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

#file_modesTypes::FileModes

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

Returns:

  • (Types::FileModes)

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

#file_pathString

The path of the file that contains conflicts.

Returns:

  • (String)

    The path of the file that contains conflicts.

#file_sizesTypes::FileSizes

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

Returns:

  • (Types::FileSizes)

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

#is_binary_fileTypes::IsBinaryFile

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

Returns:

  • (Types::IsBinaryFile)

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

#merge_operationsTypes::MergeOperations

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

Returns:

  • (Types::MergeOperations)

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

#number_of_conflictsInteger

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

Returns:

  • (Integer)

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

#object_type_conflictBoolean

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

Returns:

  • (Boolean)

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

#object_typesTypes::ObjectTypes

Information about any object type conflicts in a merge operation.

Returns:

  • (Types::ObjectTypes)

    Information about any object type conflicts in a merge operation.