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

Inherits:
Struct
  • Object
show all
Defined in:
gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb

Overview

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

Constant Summary collapse

SENSITIVE =
[]

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)


1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_mode_conflictBoolean

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

Returns:

  • (Boolean)


1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_modesTypes::FileModes

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

Returns:



1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_pathString

The path of the file that contains conflicts.

Returns:

  • (String)


1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_sizesTypes::FileSizes

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

Returns:



1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#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:



1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#merge_operationsTypes::MergeOperations

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



1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#number_of_conflictsInteger

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

Returns:

  • (Integer)


1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#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)


1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#object_typesTypes::ObjectTypes

Information about any object type conflicts in a merge operation.

Returns:



1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1276

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end